Merge tag 'jdk-11.0.10+8'

.hgtags

@@ -624,3 +624,6 @@ f3168de4eb0dd74bf8e81537f62742bde5e412c3 jdk-11.0.10+1
 a35aa07b57bab3690224e3af939ee085d50eb476 jdk-11.0.10+2
 bca12c00a776f8cee7a0eeaf788499b9eab9cf9d jdk-11.0.10+3
 9504fa6f98f5aad0aa1ac36d5bff3260a32020c8 jdk-11.0.10+4
+5f5c3544ccb4d0bbc638e665524b292860dd9515 jdk-11.0.10+5
+4b9bc2a1dde0631958393125997855382325964d jdk-11.0.10+6
+c45f74d45787a857d35b5a66c9b0304c91a9c5d0 jdk-11.0.10+7

src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp

@@ -101,6 +101,11 @@ inline void ShenandoahConcurrentMark::do_chunked_array_start(ShenandoahObjToScan
  objArrayOop array = objArrayOop(obj);
  int len = array->length();
 
+ // Mark objArray klass metadata
+ if (Devirtualizer::do_metadata(cl)) {
+ Devirtualizer::do_klass(cl, array->klass());
+ }
+
  if (len <= (int) ObjArrayMarkingStride*2) {
  // A few slices only, process directly
  array->oop_iterate_range(cl, 0, len);

src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp

@@ -115,6 +115,7 @@ class ShenandoahHeap : public CollectedHeap {
  friend class VMStructs;
  friend class ShenandoahGCSession;
  friend class ShenandoahGCStateResetter;
+ friend class ShenandoahSafepoint;
 
 // ---------- Locks that guard important data structures in Heap
 //

src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp

@@ -129,9 +129,15 @@ class ShenandoahSafepoint : public AllStatic {
  static inline bool is_at_shenandoah_safepoint() {
  if (!SafepointSynchronize::is_at_safepoint()) return false;
 
+ Thread* const thr = Thread::current();
+ // Shenandoah GC specific safepoints are scheduled by control thread.
+ // So if we are enter here from control thread, then we are definitely not
+ // at Shenandoah safepoint, but at something else.
+ if (thr == ShenandoahHeap::heap()->control_thread()) return false;
+
  // This is not VM thread, cannot see what VM thread is doing,
  // so pretend this is a proper Shenandoah safepoint
- if (!Thread::current()->is_VM_thread()) return true;
+ if (!thr->is_VM_thread()) return true;
 
  // Otherwise check we are at proper operation type
  VM_Operation* vm_op = VMThread::vm_operation();

src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java

@@ -70,7 +70,7 @@ public SecretKey deriveKey(String algorithm,
  private SecretKey t12DeriveKey(String algorithm,
  AlgorithmParameterSpec params) throws IOException {
  try {
- KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
+ KeyAgreement ka = JsseJce.getKeyAgreement(algorithmName);
  ka.init(localPrivateKey);
  ka.doPhase(peerPublicKey, true);
  SecretKey preMasterSecret
@@ -99,7 +99,7 @@ private SecretKey t12DeriveKey(String algorithm,
  private SecretKey t13DeriveKey(String algorithm,
  AlgorithmParameterSpec params) throws IOException {
  try {
- KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
+ KeyAgreement ka = JsseJce.getKeyAgreement(algorithmName);
  ka.init(localPrivateKey);
  ka.doPhase(peerPublicKey, true);
  SecretKey sharedSecret

src/java.base/share/classes/sun/security/ssl/NamedGroup.java

@@ -245,7 +245,7 @@ static NamedGroup valueOf(int id) {
  }
 
  static NamedGroup valueOf(ECParameterSpec params) {
- String oid = ECUtil.getCurveName(null, params);
+ String oid = JsseJce.getNamedCurveOid(params);
  if ((oid != null) && (!oid.isEmpty())) {
  for (NamedGroup group : NamedGroup.values()) {
  if ((group.type == NamedGroupType.NAMED_GROUP_ECDHE)
@@ -267,6 +267,8 @@ static NamedGroup valueOf(DHParameterSpec params) {
  DHParameterSpec ngParams = null;
  // functions is non-null for FFDHE type
  AlgorithmParameters aps = ng.functions.getParameters(ng);
+ if (aps == null)
+ continue;
  try {
  ngParams = aps.getParameterSpec(DHParameterSpec.class);
  } catch (InvalidParameterSpecException ipse) {
@@ -627,7 +629,7 @@ protected Optional<AlgorithmParameters> getParametersImpl(
  NamedGroup ng) {
  try {
  AlgorithmParameters params
- = AlgorithmParameters.getInstance("DiffieHellman");
+ = JsseJce.getAlgorithmParameters("DiffieHellman");
  AlgorithmParameterSpec spec
  = getFFDHEDHParameterSpec(ng);
  params.init(spec);
@@ -703,7 +705,7 @@ protected Optional<AlgorithmParameters> getParametersImpl(
  NamedGroup ng) {
  try {
  AlgorithmParameters params
- = AlgorithmParameters.getInstance("EC");
+ = JsseJce.getAlgorithmParameters("EC");
  AlgorithmParameterSpec spec
  = new ECGenParameterSpec(ng.oid);
  params.init(spec);
@@ -767,7 +769,7 @@ public AlgorithmParameterSpec getParameterSpec(NamedGroup ng) {
  public boolean isAvailable(NamedGroup ng) {
 
  try {
- KeyAgreement.getInstance(ng.algorithm);
+ JsseJce.getKeyAgreement(ng.algorithm);
  return true;
  } catch (NoSuchAlgorithmException ex) {
  return false;

src/java.base/share/classes/sun/security/ssl/XDHKeyExchange.java

@@ -83,7 +83,7 @@ static XDHECredentials valueOf(NamedGroup namedGroup,
 
  XECPublicKeySpec xecPublicKeySpec = new XECPublicKeySpec(
  new NamedParameterSpec(namedGroup.name), u);
- KeyFactory factory = KeyFactory.getInstance(namedGroup.algorithm);
+ KeyFactory factory = JsseJce.getKeyFactory(namedGroup.algorithm);
  XECPublicKey publicKey = (XECPublicKey) factory.generatePublic(
  xecPublicKeySpec);
 
@@ -100,7 +100,7 @@ static final class XDHEPossession implements NamedGroupPossession {
  XDHEPossession(NamedGroup namedGroup, SecureRandom random) {
  try {
  KeyPairGenerator kpg
- = KeyPairGenerator.getInstance(namedGroup.algorithm);
+ = JsseJce.getKeyPairGenerator(namedGroup.algorithm);
  AlgorithmParameterSpec params = namedGroup.getParameterSpec();
  kpg.initialize(params, random);
  KeyPair kp = kpg.generateKeyPair();

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h

@@ -37,9 +37,6 @@
 
  // TODO: NSMenu *contextualMenu;
 
- // Keyboard layout
- NSString *kbdLayout;
-
  // dnd support (see AppKit/NSDragging.h, NSDraggingSource/Destination):
  CDragSource *_dragSource;
  CDropTarget *_dropTarget;

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

@@ -37,6 +37,9 @@
 #import <Carbon/Carbon.h>
 #import <JavaNativeFoundation/JavaNativeFoundation.h>
 
+// keyboard layout
+static NSString *kbdLayout;
+
 @interface AWTView()
 @property (retain) CDropTarget *_dropTarget;
 @property (retain) CDragSource *_dragSource;
@@ -1019,7 +1022,7 @@ - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange
  [self abandonInput];
 }
 
-- (void)keyboardInputSourceChanged:(NSNotification *)notification
++ (void)keyboardInputSourceChanged:(NSNotification *)notification
 {
 #ifdef IM_DEBUG
  NSLog(@"keyboardInputSourceChangeNotification received");
@@ -1316,7 +1319,7 @@ static JNF_MEMBER_CACHE(jm_characterIndexForPoint, jc_CInputMethod,
  jint index = JNFCallIntMethod(env, fInputMethodLOCKABLE, jm_characterIndexForPoint, (jint)flippedLocation.x, (jint)flippedLocation.y); // AWT_THREADING Safe (AWTRunLoopMode)
 
 #ifdef IM_DEBUG
- fprintf(stderr, "characterIndexForPoint returning %ld\n", index);
+ fprintf(stderr, "characterIndexForPoint returning %d\n", index);
 #endif // IM_DEBUG
 
  if (index == -1) {

test/hotspot/jtreg/ProblemList.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all
 # :hotspot_runtime
 
 runtime/CompressedOops/UseCompressedOops.java 8079353 generic-all
+runtime/handshake/HandshakeWalkSuspendExitTest.java 8214174 generic-all
 runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all
 runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
 

test/jdk/ProblemList.txt

@@ -640,6 +640,7 @@ com/sun/nio/sctp/SctpChannel/SocketOptionTests.java 8141694 linux-al
 # jdk_security
 
 sun/security/pkcs11/ec/TestKeyFactory.java 8026976 generic-all
+sun/security/pkcs11/KeyStore/ClientAuth.sh 8254806 solaris-all
 sun/security/pkcs11/Secmod/AddTrustedCert.java 8180837 generic-all
 sun/security/pkcs11/tls/TestKeyMaterial.java 8180837 generic-all
 sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8161536 generic-all

test/jdk/sun/security/lib/cacerts/VerifyCACerts.java

@@ -27,6 +27,7 @@
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
  * 8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  * 8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
+ * 8225072 8258630
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -271,6 +272,10 @@ public class VerifyCACerts {
  add("verisigntsaca [jdk]");
  // Valid until: Fri Jan 01 15:59:59 PST 2021
  add("thawtepremiumserverca [jdk]");
+ // Valid until: Wed Mar 17 02:51:37 PDT 2021
+ add("luxtrustglobalrootca [jdk]");
+ // Valid until: Wed Mar 17 11:33:33 PDT 2021
+ add("quovadisrootca [jdk]");
  }
  };