Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/corba.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/corba.tar.xz differ
diff -Nru openjdk-8-8u292-b10/debian/changelog openjdk-8-8u312-b07/debian/changelog
--- openjdk-8-8u292-b10/debian/changelog	2021-04-21 11:46:09.000000000 +0000
+++ openjdk-8-8u312-b07/debian/changelog	2021-11-03 13:54:59.000000000 +0000
@@ -1,8 +1,69 @@
-openjdk-8 (8u292-b10-0ubuntu1~20.04) focal-security; urgency=medium
+openjdk-8 (8u312-b07-0ubuntu1~20.04) focal-security; urgency=medium
 
-  * Backport the security update to 20.04 LTS.
+  * Security update for Ubuntu 20.04.
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 21 Apr 2021 13:46:09 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Nov 2021 15:54:59 +0200
+
+openjdk-8 (8u312-b07-0ubuntu1) jammy; urgency=medium
+
+  * Update to 8u312-b07 (GA).
+  * Security fixes
+    - JDK-8130183, CVE-2021-35588: InnerClasses: VM permits wrong Throw
+      ClassFormatError if InnerClasses attribute's inner_class_info_index is 0.
+    - JDK-8161016: Strange behavior of URLConnection with proxy.
+    - JDK-8163326, CVE-2021-35550: Update the default enabled cipher suites
+      preference.
+    - JDK-8254967, CVE-2021-35565: com.sun.net.HttpsServer spins on TLS
+      session close.
+    - JDK-8263314: Enhance XML Dsig modes.
+    - JDK-8265167, CVE-2021-35556: Richer Text Editors.
+    - JDK-8265574: Improve handling of sheets.
+    - JDK-8265580, CVE-2021-35559: Enhanced style for RTF kit.
+    - JDK-8265776: Improve Stream handling for SSL.
+    - JDK-8266097, CVE-2021-35561: Better hashing support.
+    - JDK-8266103: Better specified spec values.
+    - JDK-8266109: More Resilient Classloading.
+    - JDK-8266115: More Manifest Jar Loading.
+    - JDK-8266137, CVE-2021-35564: Improve Keystore integrity.
+    - JDK-8266689, CVE-2021-35567: More Constrained Delegation.
+    - JDK-8267086: ArrayIndexOutOfBoundsException in
+      java.security.KeyFactory.generatePublic.
+    - JDK-8267712: Better LDAP reference processing.
+    - JDK-8267729, CVE-2021-35578: Improve TLS client handshaking.
+    - JDK-8267735, CVE-2021-35586: Better BMP support.
+    - JDK-8268193: Improve requests of certificates.
+    - JDK-8268199: Correct certificate requests.
+    - JDK-8268506: More Manifest Digests.
+    - JDK-8269618, CVE-2021-35603: Better session identification.
+    - JDK-8269624: Enhance method selection support.
+    - JDK-8270398: Enhance canonicalization.
+    - JDK-8270404: Better canonicalization.
+  * Use mktemp instead of tempfile in maintainer script.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Nov 2021 14:27:30 +0200
+
+openjdk-8 (8u302-b08-0ubuntu2) impish; urgency=medium
+
+  * Update to 8u302-b08 (GA).
+  * Security fixes
+    - JDK-8256157: Improve bytecode assembly
+    - JDK-8256491: Better HTTP transport
+    - JDK-8258432, CVE-2021-2341: Improve file transfers
+    - JDK-8260453: Improve Font Bounding
+    - JDK-8260960: Signs of jarsigner signing
+    - JDK-8260967, CVE-2021-2369: Better jar file validation
+    - JDK-8262380: Enhance XML processing passes
+    - JDK-8262403: Enhanced data transfer
+    - JDK-8262410: Enhanced rules for zones
+    - JDK-8262477: Enhance String Conclusions
+    - JDK-8262967: Improve Zip file support
+    - JDK-8264066, CVE-2021-2388: Enhance compiler validation
+    - JDK-8264079: Improve abstractions
+    - JDK-8264460: Improve NTLM support
+  * Other changes:
+    See https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-July/014118.html
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Aug 2021 16:45:43 +0200
 
 openjdk-8 (8u292-b10-0ubuntu1) hirsute; urgency=medium
 
diff -Nru openjdk-8-8u292-b10/debian/JB-jre-headless.postinst.in openjdk-8-8u312-b07/debian/JB-jre-headless.postinst.in
--- openjdk-8-8u292-b10/debian/JB-jre-headless.postinst.in	2015-03-17 00:13:29.000000000 +0000
+++ openjdk-8-8u312-b07/debian/JB-jre-headless.postinst.in	2021-11-03 13:41:38.000000000 +0000
@@ -109,7 +109,7 @@
     # activate class data sharing
     case @archdir@ in i386|sparc)
 	rm -f $basedir/jre/lib/@archdir@/client/classes.jsa
-	log=$(tempfile)
+	log=$(mktemp)
 	if ! $basedir/bin/java -client -Xshare:dump -XX:PermSize=128m > $log; then
 	    cat >&2 $log
 	    rm -f $log
@@ -121,7 +121,7 @@
     esac
     case @archdir@ in amd64|i386|sparc)
 	rm -f $basedir/jre/lib/@archdir@/server/classes.jsa
-	log=$(tempfile)
+	log=$(mktemp)
 	if ! $basedir/bin/java -server -Xshare:dump > $log; then
 	    cat >&2 $log
 	    rm -f $log
diff -Nru openjdk-8-8u292-b10/debian/patches/aarch32-update.diff openjdk-8-8u312-b07/debian/patches/aarch32-update.diff
--- openjdk-8-8u292-b10/debian/patches/aarch32-update.diff	2021-04-21 10:11:44.000000000 +0000
+++ openjdk-8-8u312-b07/debian/patches/aarch32-update.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
---- a/hotspot/src/share/vm/code/dependencies.cpp	2021-03-29 19:21:07.000000000 +0000
-+++ b/hotspot/src/share/vm/code/dependencies.cpp	2021-04-08 05:00:17.000000000 +0000
-@@ -29,6 +29,7 @@
- #include "ci/ciMethod.hpp"
- #include "code/dependencies.hpp"
- #include "compiler/compileLog.hpp"
-+#include "oops/klass.hpp"
- #include "oops/oop.inline.hpp"
- #include "runtime/handles.hpp"
- #include "runtime/handles.inline.hpp"
-@@ -896,8 +897,9 @@
-     } else if (!k->oop_is_instance()) {
-       return false; // no methods to find in an array type
-     } else {
--      // Search class hierarchy first.
--      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature);
-+      // Search class hierarchy first, skipping private implementations
-+      // as they never override any inherited methods
-+      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::skip_private);
-       if (!Dependencies::is_concrete_method(m, k)) {
-         // Check for re-abstraction of method
-         if (!k->is_interface() && m != NULL && m->is_abstract()) {
-@@ -907,7 +909,7 @@
-           ClassHierarchyWalker wf(_participants, _num_participants);
-           Klass* w = wf.find_witness_subtype(k);
-           if (w != NULL) {
--            Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature);
-+            Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature, Klass::skip_private);
-             if (!Dependencies::is_concrete_method(wm, w)) {
-               // Found a concrete subtype 'w' which does not override abstract method 'm'.
-               // Bail out because 'm' could be called with 'w' as receiver (leading to an
-@@ -968,6 +970,7 @@
-   Klass* find_witness_in(KlassDepChange& changes,
-                          Klass* context_type,
-                            bool participants_hide_witnesses);
-+  bool witnessed_reabstraction_in_supers(Klass* k);
-  public:
-   Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) {
-     assert(doing_subtype_search(), "must set up a subtype search");
-@@ -1042,7 +1045,6 @@
- #define count_find_witness_calls() (0)
- #endif //PRODUCT
- 
--
- Klass* ClassHierarchyWalker::find_witness_in(KlassDepChange& changes,
-                                                Klass* context_type,
-                                                bool participants_hide_witnesses) {
-@@ -1080,15 +1082,20 @@
-     }
-   }
- 
--  if (is_witness(new_type) &&
--      !ignore_witness(new_type)) {
--    return new_type;
-+  if (is_witness(new_type)) {
-+    if (!ignore_witness(new_type)) {
-+      return new_type;
-+    }
-+  } else if (!doing_subtype_search()) {
-+    // No witness found, but is_witness() doesn't detect method re-abstraction in case of spot-checking.
-+    if (witnessed_reabstraction_in_supers(new_type)) {
-+      return new_type;
-+    }
-   }
- 
-   return NULL;
- }
- 
--
- // Walk hierarchy under a context type, looking for unexpected types.
- // Do not report participant types, and recursively walk beneath
- // them only if participants_hide_witnesses is false.
-@@ -1207,6 +1214,32 @@
- #undef ADD_SUBCLASS_CHAIN
- }
- 
-+bool ClassHierarchyWalker::witnessed_reabstraction_in_supers(Klass* k) {
-+  if (!k->oop_is_instance()) {
-+    return false; // no methods to find in an array type
-+  } else {
-+    // Looking for a case when an abstract method is inherited into a concrete class.
-+    if (Dependencies::is_concrete_klass(k) && !k->is_interface()) {
-+      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::skip_private);
-+      if (m != NULL) {
-+        return false; // no reabstraction possible: local method found
-+      }
-+      for (InstanceKlass* super = InstanceKlass::cast(k)->java_super(); super != NULL; super = super->java_super()) {
-+        m = super->find_instance_method(_name, _signature, Klass::skip_private);
-+        if (m != NULL) { // inherited method found
-+          if (m->is_abstract() || m->is_overpass()) {
-+            _found_methods[_num_participants] = m;
-+            return true; // abstract method found
-+          }
-+          return false;
-+        }
-+      }
-+      assert(false, "root method not found");
-+      return true;
-+    }
-+    return false;
-+  }
-+}
- 
- bool Dependencies::is_concrete_klass(Klass* k) {
-   if (k->is_abstract())  return false;
---- a/hotspot/src/share/vm/oops/instanceKlass.cpp	2021-03-29 19:21:07.000000000 +0000
-+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	2021-04-08 05:00:17.000000000 +0000
-@@ -1495,18 +1495,22 @@
- 
- // find_instance_method looks up the name/signature in the local methods array
- // and skips over static methods
--Method* InstanceKlass::find_instance_method(
--    Array<Method*>* methods, Symbol* name, Symbol* signature) {
-+Method* InstanceKlass::find_instance_method(Array<Method*>* methods,
-+                                            Symbol* name,
-+                                            Symbol* signature,
-+                                            PrivateLookupMode private_mode) {
-   Method* meth = InstanceKlass::find_method_impl(methods, name, signature,
--                                                 find_overpass, skip_static, find_private);
-+                                                 find_overpass, skip_static, private_mode);
-   assert(((meth == NULL) || !meth->is_static()), "find_instance_method should have skipped statics");
-   return meth;
- }
- 
- // find_instance_method looks up the name/signature in the local methods array
- // and skips over static methods
--Method* InstanceKlass::find_instance_method(Symbol* name, Symbol* signature) {
--    return InstanceKlass::find_instance_method(methods(), name, signature);
-+Method* InstanceKlass::find_instance_method(Symbol* name,
-+                                            Symbol* signature,
-+                                            PrivateLookupMode private_mode) {
-+  return InstanceKlass::find_instance_method(methods(), name, signature, private_mode);
- }
- 
- // Find looks up the name/signature in the local methods array
---- a/hotspot/src/share/vm/oops/instanceKlass.hpp	2021-03-29 19:21:07.000000000 +0000
-+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	2021-04-08 05:00:17.000000000 +0000
-@@ -526,8 +526,11 @@
-   static Method* find_method(Array<Method*>* methods, Symbol* name, Symbol* signature);
- 
-   // find a local method, but skip static methods
--  Method* find_instance_method(Symbol* name, Symbol* signature);
--  static Method* find_instance_method(Array<Method*>* methods, Symbol* name, Symbol* signature);
-+  Method* find_instance_method(Symbol* name, Symbol* signature,
-+                               PrivateLookupMode private_mode);
-+  static Method* find_instance_method(Array<Method*>* methods,
-+                                      Symbol* name, Symbol* signature,
-+                                      PrivateLookupMode private_mode);
- 
-   // find a local method (returns NULL if not found)
-   Method* find_local_method(Symbol* name, Symbol* signature,
diff -Nru openjdk-8-8u292-b10/debian/patches/compare-pointer-with-literal.patch openjdk-8-8u312-b07/debian/patches/compare-pointer-with-literal.patch
--- openjdk-8-8u292-b10/debian/patches/compare-pointer-with-literal.patch	2017-01-23 10:09:22.000000000 +0000
+++ openjdk-8-8u312-b07/debian/patches/compare-pointer-with-literal.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/jdk/src/solaris/native/sun/awt/awt_Font.c
-+++ b/jdk/src/solaris/native/sun/awt/awt_Font.c
-@@ -502,7 +502,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject
-             jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
-                          nativename, size * 10);
- 
--            if (nativename != NULL && nativename != "")
-+            if (nativename && !strcmp(nativename, ""))
-                 JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
- 
-             /*
diff -Nru openjdk-8-8u292-b10/debian/rules openjdk-8-8u312-b07/debian/rules
--- openjdk-8-8u292-b10/debian/rules	2021-04-21 11:46:09.000000000 +0000
+++ openjdk-8-8u312-b07/debian/rules	2021-11-03 13:54:59.000000000 +0000
@@ -132,6 +132,9 @@
 ifneq (,$(filter $(DEB_HOST_ARCH), armel))
   with_check = disabled running check on $(DEB_HOST_ARCH)
 endif
+ifneq (,$(filter $(distrel),precise))
+  with_check = disabled running check on $(distrel)
+endif
 #with_check = disabled for this build
 
 with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes)
@@ -260,7 +263,7 @@
 else ifneq (,$(filter $(distrel),utopic vivid jessie))
   export CC = gcc-4.9
   export CXX = g++-4.9
-else ifneq (,$(filter $(distrel),wily))
+else ifneq (,$(filter $(distrel),xenial wily))
   export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
   export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
 else ifneq (,$(filter $(distrel),zesty stretch))
@@ -273,9 +276,12 @@
 else ifneq (,$(filter $(distrel),buster precise))
   export CC = $(DEB_HOST_GNU_TYPE)-gcc-8
   export CXX = $(DEB_HOST_GNU_TYPE)-g++-8
-else
+else ifneq (,$(filter $(distrel),trusty xenial bionic focal hirsute))
   export CC = $(DEB_HOST_GNU_TYPE)-gcc-9
   export CXX = $(DEB_HOST_GNU_TYPE)-g++-9
+else
+  export CC = $(DEB_HOST_GNU_TYPE)-gcc-11
+  export CXX = $(DEB_HOST_GNU_TYPE)-g++-11
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
@@ -353,7 +359,6 @@
 	workaround_expand_exec_shield_cs_limit.diff \
 	zero-architectures.diff \
 	adlc-parser.patch \
-	compare-pointer-with-literal.patch \
 	multiple-pkcs11-library-init.patch \
 	applet-hole.patch \
 	libjpeg-fix.diff \
@@ -421,8 +426,7 @@
 # set LIBARCH/aarch32 to arm
 ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_aarch32_archs)))
   COMMON_PATCHES += \
-	aarch32.diff \
-	aarch32-update.diff
+	aarch32.diff
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
@@ -674,7 +678,7 @@
   bd_gcc = g++-4.8,
 else ifneq (,$(filter $(distrel),utopic vivid jessie))
   bd_gcc = g++-4.9,
-else ifneq (,$(filter $(distrel),wily xenial))
+else ifneq (,$(filter $(distrel),xenial wily))
   bd_gcc = g++-5,
 else ifneq (,$(filter $(distrel),stretch zesty))
   bd_gcc = g++-6,
@@ -683,8 +687,10 @@
 #else ifneq (,$(filter $(distrel),buster precise trusty))
 else ifneq (,$(filter $(distrel),buster precise))
   bd_gcc = g++-8,
-else
+else ifneq (,$(filter $(distrel),trusty xenial bionic focal hirsute))
   bd_gcc = g++-9,
+else
+  bd_gcc = g++-11,
 endif
 bd_syslibs = zlib1g-dev, libattr1-dev,
 ifneq (,$(filter $(distrel),squeeze lucid))
@@ -2001,17 +2007,17 @@
 is_release		=
 is_release		= yes
 hg_project		= jdk8u
-hg_tag			= jdk8u292-b10
+hg_tag			= jdk8u312-b07
 package_version		= $(subst jdk,,$(hg_tag))
 ifneq ($(is_release),yes)
   package_version	:= $(subst -,~,$(package_version))
 endif
 hg_url			= http://hg.openjdk.java.net/jdk8u/$(hg_project)
 hg_project_aarch64	= jdk8u-shenandoah
-hg_tag_aarch64		= aarch64-shenandoah-jdk8u292-b10
+hg_tag_aarch64		= aarch64-shenandoah-jdk8u312-b07
 hg_url_aarch64		= http://hg.openjdk.java.net/aarch64-port/$(hg_project_aarch64)
 hg_project_aarch32	= jdk8u
-hg_tag_aarch32		= jdk8u292-b09-aarch32-20210330
+hg_tag_aarch32		= jdk8u312-b07-aarch32-20211101
 hg_url_aarch32		= http://hg.openjdk.java.net/aarch32-port/$(hg_project_aarch32)
 origdir			= ../openjdk-8-$(package_version).orig
 orig_tarball		= ../openjdk-8_$(package_version).orig.tar.xz
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/hotspot-aarch32.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/hotspot-aarch32.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/hotspot-aarch64.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/hotspot-aarch64.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/hotspot.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/hotspot.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/jaxp.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/jaxp.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/jaxws.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/jaxws.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/jdk.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/jdk.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/langtools.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/langtools.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/nashorn.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/nashorn.tar.xz differ
Binary files /tmp/tmpy92uvcru/qWmGDoYGws/openjdk-8-8u292-b10/root.tar.xz and /tmp/tmpy92uvcru/LB4UZRjZHL/openjdk-8-8u312-b07/root.tar.xz differ
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar1=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar1=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/.hg_archival.txt	2021-09-13 23:27:15.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 9a66ca7c79fab293c1bb0534e0d208c7e4f58b01
-node: e096ebc661e8c12321891587c0351a66f165143c
+node: 67e50991d2ffea9ae2436651530a6645187f7928
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/.hgtags openjdk-8-8u312-b07/=unpacked-tar1=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar1=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/.hgtags	2021-09-13 23:27:15.000000000 +0000
@@ -1087,3 +1087,22 @@
 376b8ec147cf881c1139331f64c258bfc1550119 jdk8u292-b07
 65614a3f68a2ef8a853f2c0505b8bbbf3a1414c3 jdk8u292-b08
 eabecd4e5adc603f93dc891b6245f8164d97517d jdk8u292-b09
+e096ebc661e8c12321891587c0351a66f165143c jdk8u292-b10
+e096ebc661e8c12321891587c0351a66f165143c jdk8u292-ga
+cd6eb36db1bbeb5b638a577059ecf0a4c4a90b82 jdk8u302-b00
+55148c63b3e8b5a23d4eef33a7bab2c57396a32e jdk8u302-b01
+c94d325a24672375c4767ae08bece4e7d6ea210d jdk8u302-b02
+a6ea99c01d68cb35822f03104b2f7acab656312c jdk8u302-b03
+a6ea4245dc1484ce52656fb981ad453cd4bb8488 jdk8u302-b04
+ef5cb85b148ef2fb4711df4ac075bcf8e4836e5e jdk8u302-b05
+ef5cb85b148ef2fb4711df4ac075bcf8e4836e5e jdk8u312-b00
+b13b58afad1effc6726104dacdc24748e591d9d0 jdk8u302-b06
+dccbf90608ebab1f656e53846774e436a9cd5d00 jdk8u302-b07
+361a561709af891da4bf5e9ad2f469afd602c3df jdk8u302-b08
+361a561709af891da4bf5e9ad2f469afd602c3df jdk8u302-ga
+c2908eb7d16d7899ac98cefead3993948f2d932a jdk8u312-b01
+ac02c03356e077adbf3fce8116d442eeade3dbda jdk8u312-b02
+de6e8a37b71b8e10d682e187e433c8064a9dda44 jdk8u312-b03
+7580f5f7f89007a1990b49333f369bcb12ba1caf jdk8u312-b04
+8ec4f4e9ef0fd48ee08562681eb6b8e99fa2b9fe jdk8u312-b05
+9472308f16d41cd401044a8cd2666114c28a5208 jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/src/share/classes/com/sun/tools/javac/comp/Check.java openjdk-8-8u312-b07/=unpacked-tar1=/src/share/classes/com/sun/tools/javac/comp/Check.java
--- openjdk-8-8u292-b10/=unpacked-tar1=/src/share/classes/com/sun/tools/javac/comp/Check.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/src/share/classes/com/sun/tools/javac/comp/Check.java	2021-09-13 23:27:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -2617,6 +2617,8 @@
             if (type.isErroneous()) return;
             for (List<Type> l = types.interfaces(type); l.nonEmpty(); l = l.tail) {
                 Type it = l.head;
+                if (type.hasTag(CLASS) && !it.hasTag(CLASS)) continue; // JLS 8.1.5
+
                 Type oldit = seensofar.put(it.tsym, it);
                 if (oldit != null) {
                     List<Type> oldparams = oldit.allparams();
@@ -2629,6 +2631,7 @@
                 checkClassBounds(pos, seensofar, it);
             }
             Type st = types.supertype(type);
+            if (type.hasTag(CLASS) && !st.hasTag(CLASS)) return; // JLS 8.1.4
             if (st != Type.noType) checkClassBounds(pos, seensofar, st);
         }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/test/Makefile openjdk-8-8u312-b07/=unpacked-tar1=/test/Makefile
--- openjdk-8-8u292-b10/=unpacked-tar1=/test/Makefile	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/test/Makefile	2021-09-13 23:27:15.000000000 +0000
@@ -139,21 +139,19 @@
 
 # Default JDK for JTREG and JCK
 #
-# JT_JAVA is the version of java used to run jtreg/JCK. Since it is now
-# standard to execute tests in sameVM mode, it should normally be set the
-# same as TESTJAVA (although not necessarily so.)
+# JT_JAVA is the version of java used to run jtreg/JCK. 
 #
 ifdef JPRT_JAVA_HOME
   JT_JAVA = $(JPRT_JAVA_HOME)
 else
-  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.7.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
+  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
 endif
 
 # Default JDK to test
 ifdef JPRT_IMPORT_PRODUCT_HOME
   TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
 else
-  TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
+  TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
 endif
 
 # PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from
@@ -186,7 +184,7 @@
 ifdef CONCURRENCY
   JTREG_OPTIONS += -agentvm -concurrency:$(CONCURRENCY)
 else
-  JTREG_OPTIONS += -samevm
+  JTREG_OPTIONS += -agentvm
 endif
 
 ifdef JCK_CONCURRENCY
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/diags/examples/NoJavaLang.java openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/diags/examples/NoJavaLang.java
--- openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/diags/examples/NoJavaLang.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/diags/examples/NoJavaLang.java	2021-09-13 23:27:15.000000000 +0000
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.misc.fatal.err.no.java.lang
-// options: -Xbootclasspath:
+// options: -Xbootclasspath: -classpath .
 // run: backdoor
 
 class NoJavaLang { }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/fatalErrors/NoJavaLangTest.java openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/fatalErrors/NoJavaLangTest.java
--- openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/fatalErrors/NoJavaLangTest.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/fatalErrors/NoJavaLangTest.java	2021-09-13 23:27:15.000000000 +0000
@@ -58,7 +58,7 @@
         List<String> output = new ArrayList<>();
         ToolBox.JavaToolArgs javacFailArgs =
                 new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
-                .setOptions("-bootclasspath", ".")
+                .setOptions("-bootclasspath", ".", "-classpath", ".")
                 .setSources(noJavaLangSrc)
                 .setErrOutput(output);
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.java openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.java
--- openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.java	2021-09-13 23:27:15.000000000 +0000
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8214345
+ * @summary infinite recursion while checking super class
+ *
+ * @compile/fail/ref=ClassBoundCheckingOverflow.out -XDrawDiagnostics ClassBoundCheckingOverflow.java
+ */
+
+public class ClassBoundCheckingOverflow {
+    abstract class InfiniteLoop1<E extends InfiniteLoop1<E>> extends E {}
+    abstract class InfiniteLoop2<E extends InfiniteLoop2<E>> implements E {}
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.out openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.out
--- openjdk-8-8u292-b10/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.out	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/test/tools/javac/generics/ClassBoundCheckingOverflow.out	2021-09-13 23:27:15.000000000 +0000
@@ -0,0 +1,3 @@
+ClassBoundCheckingOverflow.java:10:70: compiler.err.type.found.req: (compiler.misc.type.parameter: E), (compiler.misc.type.req.class)
+ClassBoundCheckingOverflow.java:11:73: compiler.err.type.found.req: (compiler.misc.type.parameter: E), (compiler.misc.type.req.class)
+2 errors
diff -Nru openjdk-8-8u292-b10/=unpacked-tar1=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar1=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar1=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar1=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar10=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar10=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/.hg_archival.txt	2021-09-13 23:27:09.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 6ce5f4757bde08f7470cbb9f0b46da8f2f3d4f56
-node: 8246436d1c3bc32a5325e9a9e33c41d44150b045
+node: 0a8784c38f097207c4781230fb3dd942883b3f52
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/.hgtags openjdk-8-8u312-b07/=unpacked-tar10=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar10=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/.hgtags	2021-09-13 23:27:09.000000000 +0000
@@ -1086,3 +1086,22 @@
 1fe7316192d787d0c6846691259be4ab350b140f jdk8u292-b07
 5a208ef2cc7cdbc50f0a3e50f892cea6572172f1 jdk8u292-b08
 91c9a06b7ed01e7ad2489a0592c75fa19b64e76e jdk8u292-b09
+8246436d1c3bc32a5325e9a9e33c41d44150b045 jdk8u292-b10
+8246436d1c3bc32a5325e9a9e33c41d44150b045 jdk8u292-ga
+031481db1646dcfd40025aa59ea7c9f070e88cc9 jdk8u302-b00
+f40783aba2727b313631df53fa31dfd87c9957cf jdk8u302-b01
+ea75b85dec8d82e5c0f881ced4c8569e8f5afaec jdk8u302-b02
+46a04b4c71749539a4b6c85f882bd275175babcb jdk8u302-b03
+dd6914b1b116cd8ab2ca18cf3ce2d4a15f4e5c30 jdk8u302-b04
+f529944cbf6ef83768b4acd787edc4a2aaab4398 jdk8u302-b05
+f529944cbf6ef83768b4acd787edc4a2aaab4398 jdk8u312-b00
+7443fa2f19b09a1eed10a8ca6a84c050281f94ac jdk8u302-b06
+5f019dc37164bc2615d4c3d04411b26da8f7f260 jdk8u302-b07
+41f3654e3404e5524dcbf1136acc5e6c09ffffab jdk8u302-b08
+41f3654e3404e5524dcbf1136acc5e6c09ffffab jdk8u302-ga
+211ac8fe58f622ea94613323ea945a72c65b675f jdk8u312-b01
+4e6491f455d04226359e09e7d0e7d7640aa95d86 jdk8u312-b02
+6a8a5589afaaff3e5537fa53f413f828c1139d7b jdk8u312-b03
+ebcae27bdac1f676f11cee0edc8a66cb115db243 jdk8u312-b04
+f62968808184d12e6f17e398190a019baa431bbf jdk8u312-b05
+2ffc0e316b15cf3864c37051c863d4d7f65c5004 jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
--- openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties	2021-09-13 23:27:09.000000000 +0000
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = Element or attribute do not match QName production: QName::=(NCName':')?NCName. 
+        IllegalQName = Element or attribute \"{0}\" do not match QName production: QName::=(NCName':')?NCName.
         ElementXMLNSPrefix = Element \"{0}\" cannot have \"xmlns\" as its prefix.
         ElementPrefixUnbound = The prefix \"{0}\" for element \"{1}\" is not bound.
         AttributePrefixUnbound = The prefix \"{2}\" for attribute \"{1}\" associated with an element type \"{0}\" is not bound.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
--- openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	2021-09-13 23:27:09.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +40,8 @@
  * @author Michael Glavassevich, IBM
  * @author Neil Graham, IBM
  * @version $Id: XML11EntityScanner.java,v 1.5 2010-11-01 04:39:40 joehw Exp $
+ *
+ * @LastModified: Apr 2021
  */
 
 public class XML11EntityScanner
@@ -697,7 +699,7 @@
                     sawIncompleteSurrogatePair)){
                     fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
                                                "IllegalQName",
-                                               null,
+                                               new Object[]{rawname},
                                                XMLErrorReporter.SEVERITY_FATAL_ERROR);
                 }
                 //check the result: localpart
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
--- openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	2021-09-13 23:27:09.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,6 +55,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author K.Venugopal Sun Microsystems
  *
+ * @LastModified: Apr 2021
  */
 public class XMLEntityScanner implements XMLLocator  {
 
@@ -860,6 +861,14 @@
                     prefix = fSymbolTable.addSymbol(fCurrentEntity.ch,
                             offset, prefixLength);
                     int len = length - prefixLength - 1;
+                    int startLocal = index +1;
+                    if (!XMLChar.isNCNameStart(fCurrentEntity.ch[startLocal])){
+                        fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+                                                 "IllegalQName",
+                                                  new Object[]{rawname},
+                                                  XMLErrorReporter.SEVERITY_FATAL_ERROR);
+                    }
+
                     //check the result: localpart
                     checkLimit(Limit.MAX_NAME_LIMIT, fCurrentEntity, index + 1, len);
                     localpart = fSymbolTable.addSymbol(fCurrentEntity.ch,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xml/internal/serializer/ToStream.java openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
--- openjdk-8-8u292-b10/=unpacked-tar10=/src/com/sun/org/apache/xml/internal/serializer/ToStream.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/src/com/sun/org/apache/xml/internal/serializer/ToStream.java	2021-09-13 23:27:09.000000000 +0000
@@ -38,6 +38,7 @@
 import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
 import com.sun.org.apache.xml.internal.serializer.utils.Utils;
 import com.sun.org.apache.xml.internal.serializer.utils.WrappedRuntimeException;
+import jdk.xml.internal.JdkXmlUtils;
 import org.w3c.dom.Node;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -50,7 +51,7 @@
  * serializers (xml, html, text ...) that write output to a stream.
  *
  * @xsl.usage internal
- * @LastModified: Sept 2018
+ * @LastModified: Apr 2021
  */
 abstract public class ToStream extends SerializerBase
 {
@@ -1888,21 +1889,21 @@
             String doctypeSystem = getDoctypeSystem();
             if (null != doctypeSystem)
             {
-                if (null == doctypePublic)
-                    writer.write(" SYSTEM \"");
-                else
-                    writer.write(" \"");
+                char quote = JdkXmlUtils.getQuoteChar(doctypeSystem);
+                if (null == doctypePublic) {
+                    writer.write(" SYSTEM");
+                }
+                writer.write(" ");
+                writer.write(quote);
 
                 writer.write(doctypeSystem);
-
+                writer.write(quote);
                 if (closeDecl)
                 {
-                    writer.write("\">");
+                    writer.write(">");
                     writer.write(m_lineSep, 0, m_lineSepLen);
                     closeDecl = false; // done closing
                 }
-                else
-                    writer.write('\"');
             }
             boolean dothis = false;
             if (dothis)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/src/jdk/xml/internal/JdkXmlUtils.java openjdk-8-8u312-b07/=unpacked-tar10=/src/jdk/xml/internal/JdkXmlUtils.java
--- openjdk-8-8u292-b10/=unpacked-tar10=/src/jdk/xml/internal/JdkXmlUtils.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/src/jdk/xml/internal/JdkXmlUtils.java	2021-09-13 23:27:09.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -249,6 +249,22 @@
         return tf;
     }
 
+    /**
+     * Returns the character to be used to quote the input content. Between
+     * single and double quotes, this method returns the one that is not found
+     * in the input. Returns double quote by default.
+     *
+     * @param s the input string
+     * @return returns the quote not found in the input
+     */
+    public static char getQuoteChar(String s) {
+        if (s != null && s.indexOf('"') > -1) {
+            return '\'';
+        } else {
+            return '"';
+        }
+    }
+
     private static XMLReader getXMLReaderWSAXFactory(boolean overrideDefaultParser) {
         SAXParserFactory saxFactory = getSAXFactory(overrideDefaultParser);
         try {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar10=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar10=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar10=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar10=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar11=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar11=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/.hg_archival.txt	2021-10-20 10:12:18.000000000 +0000
@@ -1,4 +1,5 @@
 repo: a61af66fc99eb5ec9d50c05b0c599757b1289ceb
-node: a324fe8ff0992309d9623a00df4153c5e466ec01
+node: 0879e6c777fd0a4db0f1a58be004f1985d74d685
 branch: default
-tag: jdk8u292-b09-aarch32-20210330
+tag: jdk8u312-b07-aarch32-20211101
+tag: jdk8u312-ga-aarch32-20210923
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/.hgtags openjdk-8-8u312-b07/=unpacked-tar11=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar11=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/.hgtags	2021-10-20 10:12:18.000000000 +0000
@@ -1446,3 +1446,43 @@
 f206e4bfcef993ce5a75ed54612f045ca047abd3 jdk8u292-b07
 d472fe27d65eea99ffdbdcdf31f6163fb34135d1 jdk8u292-b08-aarch32-20210318
 85c5bc8157df45d7351c388f18ab65297b5bdd01 jdk8u292-b08
+a324fe8ff0992309d9623a00df4153c5e466ec01 jdk8u292-b09-aarch32-20210330
+65907019826ad9fe7d13df531e0c108cc1f179b0 jdk8u292-b09
+2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-b10
+2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-ga
+fa977f20ebe018817da51a40e5dc4de9ffff71dd jdk8u292-b10-aarch32-20210423
+fa977f20ebe018817da51a40e5dc4de9ffff71dd jdk8u292-ga-aarch32-20210423
+a435c913c8ce30f0487d05cfec1d9be3fcc57f10 jdk8u302-b00
+d24969e49a6af3353c84b9a0f9aedd4736156b66 jdk8u302-b01
+a9bba04158c8030845c2200f096af636b402f035 jdk8u302-b01-aarch32-20210506
+52d6e6b0a14a12ce67ae2a25e8aaa3266b618953 jdk8u302-b02-aarch32-20210513
+8a152c8e9f14e3bdeebd7bf4e8eb2a6e8f9bbb7c jdk8u302-b02
+f637ff22ec1c783eeada8fb217c919714523e005 jdk8u302-b03-aarch32-20210521
+99e4a82f17e8debc5225d1c8834acdac673aa676 jdk8u302-b03
+465e2fa360f9518c1912d940201bc011cb918995 jdk8u302-b04-aarch32-20210531
+362d99aef38e6e179061f221df20bbb9f65b8f89 jdk8u302-b04
+00d9f55b6d01df5a6db79060e3f2f04d46497ee4 jdk8u302-b05-aarch32-20210607
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u302-b05
+6c2ceb9f24992fbef6d90fd182f9fc9c8a43f523 jdk8u302-b06-aarch32-20210630
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u312-b00
+782f3b88b5ba7d420e6c5894c19f9bf1980df239 jdk8u302-b06
+78dfe32cac588b01e28792d42e761fa35a80e8f9 jdk8u302-b07
+4b12059767b70e1155734c19f8dcf6336a457eaf jdk8u302-b07-aarch32-20210706
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-b08
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-ga
+c7ceaaaa5d93ce7a645e72dcb2aa4b633f2c881b jdk8u302-b08-aarch32-20210726
+c7ceaaaa5d93ce7a645e72dcb2aa4b633f2c881b jdk8u302-ga-aarch32-20210726
+bb927f907209b1a5c2b88d0f8937af21ba8c5d94 jdk8u312-b01-aarch32-20210817
+2f7a380c9a0ac0cf20fdb17d7b6a135da05b5d04 jdk8u312-b01
+065415b80aa485a3727d4ce725b979b64237d826 jdk8u312-b02-aarch32-20210820
+4735f3031e239dfd76c0ed2ce25c8f1cc9bd7c1f jdk8u312-b02
+a6da205dfd9f0d71dae93a310652e29d830c95ee jdk8u312-b03
+8bcb1e3714349ee87c80c51808353b379c443a21 jdk8u312-b03-aarch32-20210827
+0f09ed184342b3f66119dd6d264736fe27474a56 jdk8u312-b04-aarch32-20210902
+21394894714b0fb17e6015483e4658f75e30bbc5 jdk8u312-b04
+e7fc0c4f478e78e2ef40b8d098c02a958e385227 jdk8u312-b05
+b2ed441458ec0b0d4fbbbaa1c13c961341bcafec jdk8u312-b05-aarch32-20210903
+e2ac513ec7b343f596861645f0696bc6f0fb4364 jdk8u312-b06
+15ff1c32911c8b4e9c347f906fdf9586101b2fae jdk8u312-b06-aarch32-20210923
+8aac6d08b58e31e4938a32c2662bf822d87a5440 jdk8u312-b07
+8aac6d08b58e31e4938a32c2662bf822d87a5440 jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/defs.make openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/defs.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/defs.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/defs.make	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -142,36 +142,28 @@
         OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
       endif
 
-      ifeq ($(OBJCOPY),)
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
-        ENABLE_FULL_DEBUG_SYMBOLS=0
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-      else
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: AIX .debuginfo files will be produced by copying debug object.")
 
-        # Library stripping policies for .debuginfo configs:
-        #   all_strip - strips everything from the library
-        #   min_strip - strips most stuff from the library; leaves minimum symbols
-        #   no_strip  - does not strip the library at all
-        #
-        # Oracle security policy requires "all_strip". A waiver was granted on
-        # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-        #
-        # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
-        #
-        STRIP_POLICY ?= min_strip
+      # Library stripping policies for .debuginfo configs:
+      #   all_strip - strips everything from the library
+      #   min_strip - strips most stuff from the library; leaves minimum symbols
+      #   no_strip  - does not strip the library at all
+      #
+      # Oracle security policy requires "all_strip". A waiver was granted on
+      # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+      #
+      # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+      #
+      STRIP_POLICY ?= min_strip
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-        ZIP_DEBUGINFO_FILES ?= 1
+      ZIP_DEBUGINFO_FILES ?= 1
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-      endif
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
     endif # ENABLE_FULL_DEBUG_SYMBOLS=1
   endif # BUILD_FLAVOR
 endif # JDK_6_OR_EARLIER
@@ -185,13 +177,13 @@
 
 # client and server subdirectories have symbolic links to ../libjsig.so
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
-#  else
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
-#  endif
-#endif
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
+  else
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+  endif
+endif
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -199,25 +191,25 @@
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 ifeq ($(JVM_VARIANT_CLIENT),true)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 # Serviceability Binaries
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/jsig.make	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -64,9 +64,9 @@
 	$(QUIETLY) $(CXX) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) -o $@ $< -ldl
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
 #  ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #  else
@@ -75,11 +75,13 @@
 #    # implied else here is no stripping at all
 #    endif
 #  endif
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-#	$(RM) $(LIBJSIG_DEBUGINFO)
-#  endif
-#endif
+  ifneq ($(STRIP_POLICY),no_strip)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+	$(RM) $(LIBJSIG_DEBUGINFO)
+    endif
+  endif
+endif
 
 install_jsig: $(LIBJSIG)
 	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/saproc.make	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -88,16 +88,16 @@
 	           -o $@                                                \
 	           -lthread_db
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-  ifeq ($(STRIP_POLICY),all_strip)
-	$(QUIETLY) $(STRIP) $@
-  else
-    ifeq ($(STRIP_POLICY),min_strip)
-	$(QUIETLY) $(STRIP) -g $@
-    # implied else here is no stripping at all
-    endif
-  endif
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
+#  ifeq ($(STRIP_POLICY),all_strip)
+#	$(QUIETLY) $(STRIP) $@
+#  else
+#    ifeq ($(STRIP_POLICY),min_strip)
+#	$(QUIETLY) $(STRIP) -g $@
+#    # implied else here is no stripping at all
+#    endif
+#  endif
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
 	$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
 	$(RM) $(LIBSAPROC_DEBUGINFO)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/vm.make openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/vm.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/aix/makefiles/vm.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/aix/makefiles/vm.make	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2020 SAP SE. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -329,9 +329,9 @@
 #           fi 							        \
 #	}
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJVM_DEBUGINFO)
 #    ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #    else
@@ -340,11 +340,13 @@
 #      # implied else here is no stripping at all
 #      endif
 #    endif
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
-#	$(RM) $(LIBJVM_DEBUGINFO)
-#  endif
-#endif
+    ifneq ($(STRIP_POLICY),no_strip)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+	$(RM) $(LIBJVM_DEBUGINFO)
+      endif
+    endif
+endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
 DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/gcc.make	2021-10-20 10:12:18.000000000 +0000
@@ -313,10 +313,10 @@
 
 # Work around some compiler bugs.
 ifeq ($(USE_CLANG), true)
-  ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 2), 1)
-    OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
-    OPT_CFLAGS/unsafe.o += -O1
-  endif
+  # Known to fail with clang <= 7.0; 
+  # do no optimize these on later clang until verified
+  OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
+  OPT_CFLAGS/unsafe.o += -O1
 else
   # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation.
   ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
@@ -362,7 +362,15 @@
 # Linker flags
 
 # statically link libstdc++.so, work with gcc but ignored by g++
-STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+ifeq ($(OS_VENDOR), Darwin)
+  ifeq ($(USE_CLANG), true)
+    STATIC_STDCXX = -Wl,-Bstatic -lc++ -Wl,-Bdynamic
+  else
+    STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+  endif
+else
+  STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+endif
 
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/jsig.make	2021-10-20 10:12:18.000000000 +0000
@@ -54,6 +54,11 @@
 
 LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
+ifeq ($(OS_VENDOR), Darwin)
+# bring in minimum version argument or we'll fail on OSX 10.10
+LFLAGS_JSIG += $(LFLAGS)
+endif
+
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
   JSIG_DEBUG_CFLAGS = -g
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/bsd/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/bsd/makefiles/saproc.make	2021-10-20 10:12:18.000000000 +0000
@@ -78,8 +78,10 @@
     ifneq ($(SDKPATH),)
       SA_SYSROOT_FLAGS += -isysroot "$(SDKPATH)" -iframework"$(SDKPATH)/System/Library/Frameworks"
     endif
-    # always needed, even if SDKPATH is empty
-    SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    ifneq ($(wildcard "$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"), "")
+      # always needed, even if SDKPATH is empty
+      SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    endif
   else
     SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
     SALIBS = 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/make/linux/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar11=/make/linux/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar11=/make/linux/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/make/linux/makefiles/gcc.make	2021-10-20 10:12:18.000000000 +0000
@@ -227,6 +227,18 @@
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 
+# On newer GCCs, the compiler complains about null being passed
+# to the %s format specifier. The warning appears only on 8u,
+# but the code is largely the same up to trunk. We disable
+# the warning until the code is fixed, to allow builds with
+# -Werror (the default).
+# See JDK-8269388 and PR3798 in IcedTea:
+# https://icedtea.wildebeest.org/hg/icedtea8-forest/hotspot/rev/9f2ceb42dc64
+# Option only exists on GCC 7 and later, checked by configure
+ifeq ($(USE_FORMAT_OVERFLOW), 1)
+  CFLAGS_WARN/os_linux.o = $(CFLAGS_WARN/DEFAULT) -Wno-error=format-overflow
+endif
+
 # The flags to use for an Optimized g++ build
 OPT_CFLAGS/SIZE=-Os
 OPT_CFLAGS/SPEED=-O3
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/aarch64.ad openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/aarch64.ad
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/aarch64.ad	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/aarch64.ad	2021-10-20 10:12:18.000000000 +0000
@@ -926,6 +926,8 @@
 
 source_hpp %{
 
+#include "opto/addnode.hpp"
+
 class CallStubImpl {
  
   //--------------------------------------------------------------
@@ -980,6 +982,9 @@
 
   // predicate controlling translation of StoreCM
   bool unnecessary_storestore(const Node *storecm);
+
+  // predicate controlling addressing modes
+  bool size_fits_all_mem_uses(AddPNode* addp, int shift);
 %}
 
 source %{
@@ -2159,6 +2164,26 @@
   return FP_REG_mask();
 }
 
+bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
+  for (DUIterator_Fast imax, i = addp->fast_outs(imax); i < imax; i++) {
+    Node* u = addp->fast_out(i);
+    if (u->is_LoadStore()) {
+      // On AArch64, LoadStoreNodes (i.e. compare and swap
+      // instructions) only take register indirect as an operand, so
+      // any attempt to use an AddPNode as an input to a LoadStoreNode
+      // must fail.
+      return false;
+    }
+    if (u->is_Mem()) {
+      int opsize = u->as_Mem()->memory_size();
+      assert(opsize > 0, "unexpected memory operand size");
+      if (u->as_Mem()->memory_size() != (1<<shift)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
 
 #define MOV_VOLATILE(REG, BASE, INDEX, SCALE, DISP, SCRATCH, INSN)	\
   MacroAssembler _masm(&cbuf);						\
@@ -4755,6 +4780,8 @@
 
 operand indIndexScaledOffsetI(iRegP reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4769,6 +4796,8 @@
 
 operand indIndexScaledOffsetL(iRegP reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4797,6 +4826,8 @@
 
 operand indIndexScaledOffsetI2L(iRegP reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -4811,6 +4842,8 @@
 
 operand indIndexScaledI2L(iRegP reg, iRegI ireg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -4825,6 +4858,8 @@
 
 operand indIndexScaled(iRegP reg, iRegL lreg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL lreg scale));
   op_cost(0);
@@ -4980,7 +5015,9 @@
 
 operand indIndexScaledOffsetIN(iRegN reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(0);
@@ -4995,7 +5032,9 @@
 
 operand indIndexScaledOffsetLN(iRegN reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -5025,7 +5064,9 @@
 
 operand indIndexScaledOffsetI2LN(iRegN reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -5040,7 +5081,9 @@
 
 operand indIndexScaledI2LN(iRegN reg, iRegI ireg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -5055,7 +5098,9 @@
 
 operand indIndexScaledN(iRegN reg, iRegL lreg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL lreg scale));
   op_cost(0);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/assembler_aarch64.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/assembler_aarch64.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -1288,7 +1288,7 @@
 
   INSN(ldrs, 0b00, 1);
   INSN(ldrd, 0b01, 1);
-  INSN(ldrq, 0x10, 1);
+  INSN(ldrq, 0b10, 1);
 
 #undef INSN
 
@@ -1975,7 +1975,7 @@
  public:
 
   enum SIMD_Arrangement {
-       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D
+       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D, T1Q
   };
 
   enum SIMD_RegVariant {
@@ -2306,14 +2306,16 @@
     f(0b001111, 15, 10), rf(Vn, 5), rf(Xd, 0);
   }
 
-  // We do not handle the 1Q arrangement.
   void pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
     starti;
-    assert(Ta == T8H && (Tb == T8B || Tb == T16B), "Invalid Size specifier");
-    f(0, 31), f(Tb & 1, 30), f(0b001110001, 29, 21), rf(Vm, 16), f(0b111000, 15, 10);
-    rf(Vn, 5), rf(Vd, 0);
+    assert((Ta == T1Q && (Tb == T1D || Tb == T2D)) ||
+           (Ta == T8H && (Tb == T8B || Tb == T16B)), "Invalid Size specifier");
+    int size = (Ta == T1Q) ? 0b11 : 0b00;
+    f(0, 31), f(Tb & 1, 30), f(0b001110, 29, 24), f(size, 23, 22);
+    f(1, 21), rf(Vm, 16), f(0b111000, 15, 10), rf(Vn, 5), rf(Vd, 0);
   }
   void pmull2(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
+    assert(Tb == T2D || Tb == T16B, "pmull2 assumes T2D or T16B as the second size specifier");
     pmull(Vd, Ta, Vn, Vm, Tb);
   }
 
@@ -2326,15 +2328,6 @@
     f(0b100001010010, 21, 10), rf(Vn, 5), rf(Vd, 0);
   }
 
-  void rev32(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn)
-  {
-    starti;
-    assert(T <= T8H, "must be one of T8B, T16B, T4H, T8H");
-    f(0, 31), f((int)T & 1, 30), f(0b101110, 29, 24);
-    f(T <= T16B ? 0b00 : 0b01, 23, 22), f(0b100000000010, 21, 10);
-    rf(Vn, 5), rf(Vd, 0);
-  }
-
   void dup(FloatRegister Vd, SIMD_Arrangement T, Register Xs)
   {
     starti;
@@ -2367,6 +2360,68 @@
 
 #undef INSN
 
+   // Table vector lookup
+#define INSN(NAME, op)                                                  \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, unsigned registers, FloatRegister Vm) { \
+    starti;                                                             \
+    assert(T == T8B || T == T16B, "invalid arrangement");               \
+    assert(0 < registers && registers <= 4, "invalid number of registers"); \
+    f(0, 31), f((int)T & 1, 30), f(0b001110000, 29, 21), rf(Vm, 16), f(0, 15); \
+    f(registers - 1, 14, 13), f(op, 12),f(0b00, 11, 10), rf(Vn, 5), rf(Vd, 0); \
+  }
+
+  INSN(tbl, 0);
+  INSN(tbx, 1);
+
+#undef INSN
+
+  // AdvSIMD two-reg misc
+#define INSN(NAME, U, opcode)                                                       \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {               \
+       starti;                                                                      \
+       assert((ASSERTION), MSG);                                                    \
+       f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24);                   \
+       f((int)(T >> 1), 23, 22), f(0b10000, 21, 17), f(opcode, 16, 12);             \
+       f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0);                                       \
+ }
+
+#define MSG "invalid arrangement"
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H || T == T2S || T == T4S)
+  INSN(rev64, 0, 0b00000);
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H)
+  INSN(rev32, 1, 0b00000);
+private:
+  INSN(_rbit, 1, 0b00101);
+public:
+
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B)
+  INSN(rev16, 0, 0b00001);
+  // RBIT only allows T8B and T16B but encodes them oddly.  Argh...
+  void rbit(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {
+    assert((ASSERTION), MSG);
+    _rbit(Vd, SIMD_Arrangement(T & 1 | 0b010), Vn);
+  }
+#undef ASSERTION
+
+#undef MSG
+
+#undef INSN
+
+ void ext(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm, int index)
+   {
+     starti;
+     assert(T == T8B || T == T16B, "invalid arrangement");
+     assert((T == T8B && index <= 0b0111) || (T == T16B && index <= 0b1111), "Invalid index value");
+     f(0, 31), f((int)T & 1, 30), f(0b101110000, 29, 21);
+     rf(Vm, 16), f(0, 15), f(index, 14, 11);
+     f(0, 10), rf(Vn, 5), rf(Vd, 0);
+   }
+
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
   }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -603,12 +603,12 @@
   } else {
     assert (x->op() == Bytecodes::_imul, "expect imul");
     if (right.is_constant()) {
-      int c = right.get_jint_constant();
-      if (! is_power_of_2(c) && ! is_power_of_2(c + 1) && ! is_power_of_2(c - 1)) {
-        // Cannot use constant op.
-        right.load_item();
+      jint c = right.get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+        right_arg->dont_load_item();
       } else {
-        right.dont_load_item();
+        // Cannot use constant op.
+        right_arg->load_item();
       }
     } else {
       right.load_item();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -143,9 +143,9 @@
 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
-    stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
+    stp(arg3, arg2, Address(pre(sp, -2 * wordSize)));
     stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
     ldp(c_rarg1, zr, Address(post(sp, 2 * wordSize)));
     ldp(c_rarg3, c_rarg2, Address(post(sp, 2 * wordSize)));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -644,6 +644,11 @@
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
 
+  // lr could be poisoned with PAC signature during throw_pending_exception
+  // if it was tail-call optimized by compiler, since lr is not callee-saved
+  // reload it with proper value
+  adr(lr, l);
+
   // reset last Java frame
   // Only interpreter should have to clear fp
   reset_last_Java_frame(true);
@@ -1262,7 +1267,7 @@
   stp(rscratch2, lr, Address(pre(sp, -2 * wordSize)));
 
   mov(r0, reg);
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -1298,7 +1303,7 @@
   } else {
     ldr(r0, addr);
   }
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -1993,8 +1998,8 @@
 void MacroAssembler::stop(const char* msg) {
   address ip = pc();
   pusha();
-  mov(c_rarg0, (address)msg);
-  mov(c_rarg1, (address)ip);
+  movptr(c_rarg0, (uintptr_t)(address)msg);
+  movptr(c_rarg1, (uintptr_t)(address)ip);
   mov(c_rarg2, sp);
   mov(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
   blr(c_rarg3);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013, Red Hat Inc.
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates.
  * All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1367,10 +1367,10 @@
       __ ldr(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ verify_oop(temp);
     } else {
-      __ ldrw(r16, Address(a, rscratch2, Address::lsl(exact_log2(size))));
+      __ ldrw(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ decode_heap_oop(temp); // calls verify_oop
     }
-    __ add(rscratch2, rscratch2, size);
+    __ add(rscratch2, rscratch2, 1);
     __ b(loop);
     __ bind(end);
   }
@@ -3204,6 +3204,69 @@
     return start;
   }
 
+  void ghash_multiply(FloatRegister result_lo, FloatRegister result_hi,
+                      FloatRegister a, FloatRegister b, FloatRegister a1_xor_a0,
+                      FloatRegister tmp1, FloatRegister tmp2, FloatRegister tmp3, FloatRegister tmp4) {
+    // Karatsuba multiplication performs a 128*128 -> 256-bit
+    // multiplication in three 128-bit multiplications and a few
+    // additions.
+    //
+    // (C1:C0) = A1*B1, (D1:D0) = A0*B0, (E1:E0) = (A0+A1)(B0+B1)
+    // (A1:A0)(B1:B0) = C1:(C0+C1+D1+E1):(D1+C0+D0+E0):D0
+    //
+    // Inputs:
+    //
+    // A0 in a.d[0]     (subkey)
+    // A1 in a.d[1]
+    // (A1+A0) in a1_xor_a0.d[0]
+    //
+    // B0 in b.d[0]     (state)
+    // B1 in b.d[1]
+
+    __ ext(tmp1, __ T16B, b, b, 0x08);
+    __ pmull2(result_hi, __ T1Q, b, a, __ T2D);  // A1*B1
+    __ eor(tmp1, __ T16B, tmp1, b);            // (B1+B0)
+    __ pmull(result_lo,  __ T1Q, b, a, __ T1D);  // A0*B0
+    __ pmull(tmp2, __ T1Q, tmp1, a1_xor_a0, __ T1D); // (A1+A0)(B1+B0)
+
+    __ ext(tmp4, __ T16B, result_lo, result_hi, 0x08);
+    __ eor(tmp3, __ T16B, result_hi, result_lo); // A1*B1+A0*B0
+    __ eor(tmp2, __ T16B, tmp2, tmp4);
+    __ eor(tmp2, __ T16B, tmp2, tmp3);
+
+    // Register pair <result_hi:result_lo> holds the result of carry-less multiplication
+    __ ins(result_hi, __ D, tmp2, 0, 1);
+    __ ins(result_lo, __ D, tmp2, 1, 0);
+  }
+
+  void ghash_reduce(FloatRegister result, FloatRegister lo, FloatRegister hi,
+                    FloatRegister p, FloatRegister z, FloatRegister t1) {
+    const FloatRegister t0 = result;
+
+    // The GCM field polynomial f is z^128 + p(z), where p =
+    // z^7+z^2+z+1.
+    //
+    //    z^128 === -p(z)  (mod (z^128 + p(z)))
+    //
+    // so, given that the product we're reducing is
+    //    a == lo + hi * z^128
+    // substituting,
+    //      === lo - hi * p(z)  (mod (z^128 + p(z)))
+    //
+    // we reduce by multiplying hi by p(z) and subtracting the result
+    // from (i.e. XORing it with) lo.  Because p has no nonzero high
+    // bits we can do this with two 64-bit multiplications, lo*p and
+    // hi*p.
+
+    __ pmull2(t0, __ T1Q, hi, p, __ T2D);
+    __ ext(t1, __ T16B, t0, z, 8);
+    __ eor(hi, __ T16B, hi, t1);
+    __ ext(t1, __ T16B, z, t0, 8);
+    __ eor(lo, __ T16B, lo, t1);
+    __ pmull(t0, __ T1Q, hi, p, __ T1D);
+    __ eor(result, __ T16B, lo, t0);
+  }
+
   /**
    *  Arguments:
    *
@@ -3244,6 +3307,93 @@
     return start;
   }
 
+  /**
+   *  Arguments:
+   *
+   *  Input:
+   *  c_rarg0   - current state address
+   *  c_rarg1   - H key address
+   *  c_rarg2   - data address
+   *  c_rarg3   - number of blocks
+   *
+   *  Output:
+   *  Updated state at c_rarg0
+   */
+  address generate_ghash_processBlocks() {
+    // Bafflingly, GCM uses little-endian for the byte order, but
+    // big-endian for the bit order.  For example, the polynomial 1 is
+    // represented as the 16-byte string 80 00 00 00 | 12 bytes of 00.
+    //
+    // So, we must either reverse the bytes in each word and do
+    // everything big-endian or reverse the bits in each byte and do
+    // it little-endian.  On AArch64 it's more idiomatic to reverse
+    // the bits in each byte (we have an instruction, RBIT, to do
+    // that) and keep the data in little-endian bit order throught the
+    // calculation, bit-reversing the inputs and outputs.
+
+    StubCodeMark mark(this, "StubRoutines", "ghash_processBlocks");
+    __ align(wordSize * 2);
+    address p = __ pc();
+    __ emit_int64(0x87);  // The low-order bits of the field
+                          // polynomial (i.e. p = z^7+z^2+z+1)
+                          // repeated in the low and high parts of a
+                          // 128-bit vector
+    __ emit_int64(0x87);
+
+    __ align(CodeEntryAlignment);
+    address start = __ pc();
+
+    Register state   = c_rarg0;
+    Register subkeyH = c_rarg1;
+    Register data    = c_rarg2;
+    Register blocks  = c_rarg3;
+
+    FloatRegister vzr = v30;
+    __ eor(vzr, __ T16B, vzr, vzr); // zero register
+
+    __ ldrq(v0, Address(state));
+    __ ldrq(v1, Address(subkeyH));
+
+    __ rev64(v0, __ T16B, v0);          // Bit-reverse words in state and subkeyH
+    __ rbit(v0, __ T16B, v0);
+    __ rev64(v1, __ T16B, v1);
+    __ rbit(v1, __ T16B, v1);
+
+    __ ldrq(v26, p);
+
+    __ ext(v16, __ T16B, v1, v1, 0x08); // long-swap subkeyH into v1
+    __ eor(v16, __ T16B, v16, v1);      // xor subkeyH into subkeyL (Karatsuba: (A1+A0))
+
+    {
+      Label L_ghash_loop;
+      __ bind(L_ghash_loop);
+
+      __ ldrq(v2, Address(__ post(data, 0x10))); // Load the data, bit
+                                                 // reversing each byte
+      __ rbit(v2, __ T16B, v2);
+      __ eor(v2, __ T16B, v0, v2);   // bit-swapped data ^ bit-swapped state
+
+      // Multiply state in v2 by subkey in v1
+      ghash_multiply(/*result_lo*/v5, /*result_hi*/v7,
+                     /*a*/v1, /*b*/v2, /*a1_xor_a0*/v16,
+                     /*temps*/v6, v20, v18, v21);
+      // Reduce v7:v5 by the field polynomial
+      ghash_reduce(v0, v5, v7, v26, vzr, v20);
+
+      __ sub(blocks, blocks, 1);
+      __ cbnz(blocks, L_ghash_loop);
+    }
+
+    // The bit-reversed result is at this point in v0
+    __ rev64(v1, __ T16B, v0);
+    __ rbit(v1, __ T16B, v1);
+
+    __ st1(v1, __ T16B, state);
+    __ ret(lr);
+
+    return start;
+  }
+
   // Continuation point for throwing of implicit exceptions that are
   // not handled in the current activation. Fabricates an exception
   // oop and initiates normal exception dispatching in this
@@ -4253,6 +4403,11 @@
       StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt();
     }
 
+    // generate GHASH intrinsics code
+    if (UseGHASHIntrinsics) {
+      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
+    }
+
     if (UseSHA1Intrinsics) {
       StubRoutines::_sha1_implCompress     = generate_sha1_implCompress(false,   "sha1_implCompress");
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true,    "sha1_implCompressMB");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/vm_version_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/vm_version_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -41,6 +41,10 @@
 #define HWCAP_AES   (1<<3)
 #endif
 
+#ifndef HWCAP_PMULL
+#define HWCAP_PMULL (1<<4)
+#endif
+
 #ifndef HWCAP_SHA1
 #define HWCAP_SHA1  (1<<5)
 #endif
@@ -138,6 +142,17 @@
     if (PrefetchCopyIntervalInBytes >= 32768)
       PrefetchCopyIntervalInBytes = 32760;
   }
+
+  if (AllocatePrefetchDistance !=-1 && (AllocatePrefetchDistance & 7)) {
+    warning("AllocatePrefetchDistance must be multiple of 8");
+    AllocatePrefetchDistance &= ~7;
+  }
+
+  if (AllocatePrefetchStepSize & 7) {
+    warning("AllocatePrefetchStepSize must be multiple of 8");
+    AllocatePrefetchStepSize &= ~7;
+  }
+
   FLAG_SET_DEFAULT(UseSSE42Intrinsics, true);
 
   unsigned long auxv = getauxval(AT_HWCAP);
@@ -226,7 +241,11 @@
     }
   }
 
-  if (UseGHASHIntrinsics) {
+  if (auxv & HWCAP_PMULL) {
+    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, true);
+    }
+  } else if (UseGHASHIntrinsics) {
     warning("GHASH intrinsics are not available on this CPU");
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/ppc/vm/frame_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/ppc/vm/frame_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/ppc/vm/frame_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/ppc/vm/frame_ppc.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -67,8 +67,8 @@
     return false;
   }
 
-  // Unextended sp must be within the stack and above or equal sp
-  bool unextended_sp_safe = (unextended_sp < thread->stack_base()) && (unextended_sp >= sp);
+  // Unextended sp must be within the stack
+  bool unextended_sp_safe = (unextended_sp < thread->stack_base());
 
   if (!unextended_sp_safe) {
     return false;
@@ -76,9 +76,10 @@
 
   // An fp must be within the stack and above (but not equal) sp.
   bool fp_safe = (fp <= thread->stack_base()) &&  (fp > sp);
-  // an interpreter fp must be within the stack and above (but not equal) sp
-  bool fp_interp_safe = (fp <= thread->stack_base()) &&  (fp > sp) &&
-    ((fp - sp) >= (ijava_state_size + top_ijava_frame_abi_size));
+  // An interpreter fp must be within the stack and above (but not equal) sp.
+  // Moreover, it must be at least the size of the ijava_state structure.
+  bool fp_interp_safe = (fp <= thread->stack_base()) && (fp > sp) &&
+    ((fp - sp) >= ijava_state_size);
 
   // We know sp/unextended_sp are safe, only fp is questionable here
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/sparc/vm/assembler_sparc.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/sparc/vm/assembler_sparc.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -363,6 +363,13 @@
     return is_in_wdisp_range(a, b, 30);
   }
 
+  static bool is_simm5(intptr_t x) { return is_simm(x, 5); }
+  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
+  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
+  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
+
+  static int min_simm13() { return -4096; }
+
   enum ASIs { // page 72, v9
     ASI_PRIMARY            = 0x80,
     ASI_PRIMARY_NOFAULT    = 0x82,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/x86/vm/c1_Runtime1_x86.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/x86/vm/c1_Runtime1_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -172,8 +172,8 @@
 #ifdef _LP64
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
     push(arg3);
     push(arg2);
     push(arg1);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/x86/vm/templateTable_x86_64.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/x86/vm/templateTable_x86_64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -107,10 +107,6 @@
   return Address(rsp,  Interpreter::expr_offset_in_bytes(2));
 }
 
-static inline Address at_tos_p3() {
-  return Address(rsp,  Interpreter::expr_offset_in_bytes(3));
-}
-
 // Condition conversion
 static Assembler::Condition j_not(TemplateTable::Condition cc) {
   switch (cc) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os/aix/vm/decoder_aix.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os/aix/vm/decoder_aix.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os/aix/vm/decoder_aix.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os/aix/vm/decoder_aix.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -32,7 +32,7 @@
   AIXDecoder() {
     _decoder_status = no_error;
   }
-  ~AIXDecoder() {}
+  virtual ~AIXDecoder() {}
 
   virtual bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os/bsd/vm/decoder_machO.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os/bsd/vm/decoder_machO.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os/bsd/vm/decoder_machO.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os/bsd/vm/decoder_machO.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -34,7 +34,7 @@
 class MachODecoder : public AbstractDecoder {
  public:
   MachODecoder() { }
-  ~MachODecoder() { }
+  virtual ~MachODecoder() { }
   virtual bool can_decode_C_frame_in_vm() const {
     return true;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os/windows/vm/decoder_windows.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os/windows/vm/decoder_windows.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os/windows/vm/decoder_windows.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os/windows/vm/decoder_windows.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -56,7 +56,7 @@
 
 public:
   WindowsDecoder();
-  ~WindowsDecoder() { uninitialize(); };
+  virtual ~WindowsDecoder() { uninitialize(); };
 
   bool can_decode_C_frame_in_vm() const;
   bool demangle(const char* symbol, char *buf, int buflen);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -178,7 +178,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Aix::chained_handler(sig, info, ucVoid)) {
       return 1;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -846,7 +846,7 @@
   *size = pthread_get_stacksize_np(self);
   // workaround for OS X 10.9.0 (Mavericks)
   // pthread_get_stacksize_np returns 128 pages even though the actual size is 2048 pages
-  if (pthread_main_np() == 1) {
+  if (::pthread_main_np() == 1) {
     if ((*size) < (DEFAULT_MAIN_THREAD_STACK_PAGES * (size_t)getpagesize())) {
       char kern_osrelease[256];
       size_t kern_osrelease_size = sizeof(kern_osrelease);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -185,7 +185,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Linux::chained_handler(sig, info, ucVoid)) {
       return true;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -51,21 +51,22 @@
     }
 
     if (ret_frame.is_interpreted_frame()) {
-       frame::ijava_state* istate = ret_frame.get_ijava_state();
-       if (!((Method*)(istate->method))->is_metaspace_object()) {
-         return false;
-       }
-       uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
-       uint64_t istate_bcp = istate->bcp;
-       uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
-       uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
-       if (istate_bcp >= code_start && istate_bcp < code_end) {
-         // we have a valid bcp, don't touch it, do nothing
-       } else if (reg_bcp >= code_start && reg_bcp < code_end) {
-         istate->bcp = reg_bcp;
+      frame::ijava_state *istate = ret_frame.get_ijava_state();
+      const Method *m = (const Method*)(istate->method);
+      if (m == NULL || !m->is_valid_method()) return false;
+      if (!Metaspace::contains((const void*)m)) return false;
+
+      uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
+      uint64_t istate_bcp = istate->bcp;
+      uint64_t code_start = (uint64_t)(m->code_base());
+      uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
+      if (istate_bcp >= code_start && istate_bcp < code_end) {
+        // we have a valid bcp, don't touch it, do nothing
+      } else if (reg_bcp >= code_start && reg_bcp < code_end) {
+        istate->bcp = reg_bcp;
       } else {
-         return false;
-       }
+        return false;
+      }
     }
     if (!ret_frame.safe_for_sender(this)) {
       // nothing else to try if the frame isn't good
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/tools/hsdis/hsdis.c openjdk-8-8u312-b07/=unpacked-tar11=/src/share/tools/hsdis/hsdis.c
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/tools/hsdis/hsdis.c	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/tools/hsdis/hsdis.c	2021-10-20 10:12:18.000000000 +0000
@@ -150,15 +150,15 @@
                     event_callback_t  event_callback_arg,  void* event_stream_arg,
                     printf_callback_t printf_callback_arg, void* printf_stream_arg,
                     const char* options) {
-  decode_instructions_virtual((uintptr_t)start_pv,
-                             (uintptr_t)end_pv,
-                             (unsigned char*)start_pv,
-                             (uintptr_t)end_pv - (uintptr_t)start_pv,
-                             event_callback_arg,
-                             event_stream_arg,
-                             printf_callback_arg,
-                             printf_stream_arg,
-                             options, false);
+  return decode_instructions_virtual((uintptr_t)start_pv,
+                                     (uintptr_t)end_pv,
+                                     (unsigned char*)start_pv,
+                                     (uintptr_t)end_pv - (uintptr_t)start_pv,
+                                     event_callback_arg,
+                                     event_stream_arg,
+                                     printf_callback_arg,
+                                     printf_stream_arg,
+                                     options, false);
 }
 
 static void* decode(struct hsdis_app_data* app_data, const char* options) {
@@ -237,6 +237,7 @@
   case dis_condjsr:     type = "condjsr";    break;
   case dis_dref:        type = "dref";       break;
   case dis_dref2:       type = "dref2";      break;
+  case dis_noninsn:     type = "noninsn";    break;
   }
 
   strcpy(buf, close);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/adlc/formssel.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/adlc/formssel.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/adlc/formssel.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/adlc/formssel.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -3396,7 +3396,7 @@
 // Count occurrences of operands names in the leaves of the instruction
 // match rule.
 void MatchNode::count_instr_names( Dict &names ) {
-  if( !this ) return;
+  if( this == NULL ) return;
   if( _lChild ) _lChild->count_instr_names(names);
   if( _rChild ) _rChild->count_instr_names(names);
   if( !_lChild && !_rChild ) {
@@ -3969,40 +3969,13 @@
 }
 
 int MatchRule::is_ideal_copy() const {
-  if( _rChild ) {
-    const char  *opType = _rChild->_opType;
-#if 1
-    if( strcmp(opType,"CastIP")==0 )
-      return 1;
-#else
-    if( strcmp(opType,"CastII")==0 )
-      return 1;
-    // Do not treat *CastPP this way, because it
-    // may transfer a raw pointer to an oop.
-    // If the register allocator were to coalesce this
-    // into a single LRG, the GC maps would be incorrect.
-    //if( strcmp(opType,"CastPP")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CheckCastPP")==0 )
-    //  return 1;
-    //
-    // Do not treat CastX2P or CastP2X this way, because
-    // raw pointers and int types are treated differently
-    // when saving local & stack info for safepoints in
-    // Output().
-    //if( strcmp(opType,"CastX2P")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CastP2X")==0 )
-    //  return 1;
-#endif
-  }
-  if( is_chain_rule(_AD.globalNames()) &&
-      _lChild && strncmp(_lChild->_opType,"stackSlot",9)==0 )
+  if (is_chain_rule(_AD.globalNames()) &&
+      _lChild && strncmp(_lChild->_opType, "stackSlot", 9) == 0) {
     return 1;
+  }
   return 0;
 }
 
-
 int MatchRule::is_expensive() const {
   if( _rChild ) {
     const char  *opType = _rChild->_opType;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/adlc/output_h.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/adlc/output_h.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/adlc/output_h.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/adlc/output_h.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2162,7 +2162,9 @@
 public:
   OutputMachOpcodes(FILE *hpp, FILE *cpp, FormDict &globals, ArchDesc &AD)
     : OutputMap(hpp, cpp, globals, AD, "MachOpcodes"),
-      begin_inst_chain_rule(-1), end_inst_chain_rule(-1), end_instructions(-1)
+      begin_inst_chain_rule(-1), end_inst_chain_rule(-1),
+      begin_rematerialize(-1), end_rematerialize(-1),
+      end_instructions(-1)
   {};
 
   void declaration() { }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/asm/assembler.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/asm/assembler.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/asm/assembler.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/asm/assembler.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -298,28 +298,29 @@
   void emit_double( jdouble x) { code_section()->emit_double( x); }
   void emit_address(address x) { code_section()->emit_address(x); }
 
-  // min and max values for signed immediate ranges
-  static int min_simm(int nbits) { return -(intptr_t(1) << (nbits - 1))    ; }
-  static int max_simm(int nbits) { return  (intptr_t(1) << (nbits - 1)) - 1; }
-
-  // Define some:
-  static int min_simm10() { return min_simm(10); }
-  static int min_simm13() { return min_simm(13); }
-  static int min_simm16() { return min_simm(16); }
-
-  // Test if x is within signed immediate range for nbits
-  static bool is_simm(intptr_t x, int nbits) { return min_simm(nbits) <= x && x <= max_simm(nbits); }
-
-  // Define some:
-  static bool is_simm5( intptr_t x) { return is_simm(x, 5 ); }
-  static bool is_simm8( intptr_t x) { return is_simm(x, 8 ); }
-  static bool is_simm10(intptr_t x) { return is_simm(x, 10); }
-  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
-  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
-  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
-  static bool is_simm16(intptr_t x) { return is_simm(x, 16); }
-  static bool is_simm26(intptr_t x) { return is_simm(x, 26); }
-  static bool is_simm32(intptr_t x) { return is_simm(x, 32); }
+  enum { min_simm10 = -512 };
+
+  // Test if x is within signed immediate range for width.
+  static bool is_simm(int64_t x, uint w) {
+    precond(1 < w && w < 64);
+    int64_t limes = INT64_C(1) << (w - 1);
+    return -limes <= x && x < limes;
+  }
+
+  static bool is_simm8(int64_t x) { return is_simm(x, 8); }
+  static bool is_simm9(int64_t x) { return is_simm(x, 9); }
+  static bool is_simm10(int64_t x) { return is_simm(x, 10); }
+  static bool is_simm16(int64_t x) { return is_simm(x, 16); }
+  static bool is_simm32(int64_t x) { return is_simm(x, 32); }
+
+  // Test if x is within unsigned immediate range for width.
+  static bool is_uimm(uint64_t x, uint w) {
+    precond(0 < w && w < 64);
+    uint64_t limes = UINT64_C(1) << w;
+    return x < limes;
+  }
+
+  static bool is_uimm12(uint64_t x) { return is_uimm(x, 12); }
 
   // Accessors
   CodeSection*  code_section() const   { return _code_section; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_Instruction.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_Instruction.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_Instruction.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_Instruction.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -2124,11 +2124,11 @@
   // creation
   TableSwitch(Value tag, BlockList* sux, int lo_key, ValueStack* state_before, bool is_safepoint)
     : Switch(tag, sux, state_before, is_safepoint)
-  , _lo_key(lo_key) {}
+  , _lo_key(lo_key) { assert(_lo_key <= hi_key(), "integer overflow"); }
 
   // accessors
   int lo_key() const                             { return _lo_key; }
-  int hi_key() const                             { return _lo_key + length() - 1; }
+  int hi_key() const                             { return _lo_key + (length() - 1); }
 };
 
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_IR.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_IR.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_IR.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_IR.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -578,11 +578,8 @@
     assert(is_visited(cur), "block must be visisted when block is active");
     assert(parent != NULL, "must have parent");
 
-    cur->set(BlockBegin::linear_scan_loop_header_flag);
     cur->set(BlockBegin::backward_branch_target_flag);
 
-    parent->set(BlockBegin::linear_scan_loop_end_flag);
-
     // When a loop header is also the start of an exception handler, then the backward branch is
     // an exception edge. Because such edges are usually critical edges which cannot be split, the
     // loop must be excluded here from processing.
@@ -591,6 +588,10 @@
       _iterative_dominators = true;
       return;
     }
+
+    cur->set(BlockBegin::linear_scan_loop_header_flag);
+    parent->set(BlockBegin::linear_scan_loop_end_flag);
+
     assert(parent->number_of_sux() == 1 && parent->sux_at(0) == cur,
            "loop end blocks must have one successor (critical edges are split)");
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_LIRGenerator.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_LIRGenerator.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2524,8 +2524,8 @@
   move_to_phi(x->state());
 
   int lo_key = x->lo_key();
-  int hi_key = x->hi_key();
   int len = x->length();
+  assert(lo_key <= (lo_key + (len - 1)), "integer overflow");
   LIR_Opr value = tag.result();
   if (UseTableRanges) {
     do_SwitchRanges(create_lookup_ranges(x), value, x->default_sux());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_RangeCheckElimination.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_RangeCheckElimination.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -971,7 +971,7 @@
           } else {
             // Has no upper bound
             Instruction *instr = ai->length();
-            if (instr != NULL) instr = ai->array();
+            if (instr == NULL) instr = ai->array();
             update_bound(pushed, ai->index(), Instruction::lss, instr, 0);
           }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_Runtime1.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_Runtime1.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_Runtime1.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_Runtime1.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -983,6 +983,7 @@
         address copy_buff = stub_location - *byte_skip - *byte_count;
         address being_initialized_entry = stub_location - *being_initialized_entry_offset;
         if (TracePatching) {
+          ttyLocker ttyl;
           tty->print_cr(" Patching %s at bci %d at address " INTPTR_FORMAT "  (%s)", Bytecodes::name(code), bci,
                         p2i(instr_pc), (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
           nmethod* caller_code = CodeCache::find_nmethod(caller_frame.pc());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_ValueMap.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_ValueMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/c1/c1_ValueMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/c1/c1_ValueMap.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -328,7 +328,7 @@
 };
 
 LoopInvariantCodeMotion::LoopInvariantCodeMotion(ShortLoopOptimizer *slo, GlobalValueNumbering* gvn, BlockBegin* loop_header, BlockList* loop_blocks)
-  : _gvn(gvn), _short_loop_optimizer(slo) {
+  : _gvn(gvn), _short_loop_optimizer(slo), _insertion_point(NULL), _state(NULL), _insert_is_pred(false) {
 
   TRACE_VALUE_NUMBERING(tty->print_cr("using loop invariant code motion loop_header = %d", loop_header->block_id()));
   TRACE_VALUE_NUMBERING(tty->print_cr("** loop invariant code motion for short loop B%d", loop_header->block_id()));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classFileParser.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classFileParser.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classFileParser.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classFileParser.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2801,8 +2801,7 @@
     // Inner class index
     u2 inner_class_info_index = cfs->get_u2_fast();
     check_property(
-      inner_class_info_index == 0 ||
-        valid_klass_reference_at(inner_class_info_index),
+      valid_klass_reference_at(inner_class_info_index),
       "inner_class_info_index %u has bad constant type in class file %s",
       inner_class_info_index, CHECK_0);
     // Outer class index
@@ -2812,6 +2811,13 @@
         valid_klass_reference_at(outer_class_info_index),
       "outer_class_info_index %u has bad constant type in class file %s",
       outer_class_info_index, CHECK_0);
+
+    if (outer_class_info_index != 0) {
+      const Symbol* const outer_class_name = cp->klass_name_at(outer_class_info_index);
+      char* bytes = (char*)outer_class_name->bytes();
+      guarantee_property(bytes[0] != JVM_SIGNATURE_ARRAY,
+                         "Outer class is an array class in class file %s", CHECK_0);
+    }
     // Inner class name
     u2 inner_name_index = cfs->get_u2_fast();
     check_property(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classFileParser.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classFileParser.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classFileParser.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classFileParser.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -139,7 +139,7 @@
     u2 _contended_group;
 
     AnnotationCollector(Location location)
-    : _location(location), _annotations_present(0)
+    : _location(location), _annotations_present(0), _contended_group(0)
     {
       assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classLoader.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classLoader.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/classLoader.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/classLoader.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -39,7 +39,7 @@
   int    _num_meta_package_names;
  public:
   MetaIndex(char** meta_package_names, int num_meta_package_names);
-  ~MetaIndex();
+  virtual ~MetaIndex();
   bool may_contain(const char* class_name);
 };
 
@@ -61,6 +61,7 @@
   virtual bool is_lazy();
   // Constructor
   ClassPathEntry();
+  virtual ~ClassPathEntry() {}
   // Attempt to locate file_name through this class path entry.
   // Returns a class file parsing stream if successfull.
   virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
@@ -77,6 +78,7 @@
   bool is_jar_file()  { return false;  }
   const char* name()  { return _dir; }
   ClassPathDirEntry(const char* dir);
+  virtual ~ClassPathDirEntry() {}
   ClassFileStream* open_stream(const char* name, TRAPS);
   // Debugging
   NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
@@ -106,7 +108,7 @@
   bool is_jar_file()  { return true;  }
   const char* name()  { return _zip_name; }
   ClassPathZipEntry(jzfile* zip, const char* zip_name);
-  ~ClassPathZipEntry();
+  virtual ~ClassPathZipEntry();
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void contents_do(void f(const char* name, void* context), void* context);
@@ -134,6 +136,7 @@
   bool is_jar_file();
   const char* name()  { return _path; }
   LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception);
+  virtual ~LazyClassPathEntry() {}
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/javaClasses.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/javaClasses.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/javaClasses.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/javaClasses.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1443,9 +1443,9 @@
       method = mhandle();
     }
 
-    _methods->short_at_put(_index, method->orig_method_idnum());
+    _methods->ushort_at_put(_index, method->orig_method_idnum());
     _bcis->int_at_put(_index, merge_bci_and_version(bci, method->constants()->version()));
-    _cprefs->short_at_put(_index, method->name_index());
+    _cprefs->ushort_at_put(_index, method->name_index());
 
     // We need to save the mirrors in the backtrace to keep the class
     // from being unloaded while we still have this stack trace.
@@ -1562,10 +1562,10 @@
         Handle mirror(THREAD, mirrors->obj_at(index));
         // NULL mirror means end of stack trace
         if (mirror.is_null()) goto handle_cause;
-        int method = methods->short_at(index);
+        int method = methods->ushort_at(index);
         int version = version_at(bcis->int_at(index));
         int bci = bci_at(bcis->int_at(index));
-        int cpref = cprefs->short_at(index);
+        int cpref = cprefs->ushort_at(index);
         print_stack_element(st, mirror, method, version, bci, cpref);
       }
       result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
@@ -1858,10 +1858,10 @@
 
   assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check");
 
-  int method = methods->short_at(chunk_index);
+  int method = methods->ushort_at(chunk_index);
   int version = version_at(bcis->int_at(chunk_index));
   int bci = bci_at(bcis->int_at(chunk_index));
-  int cpref = cprefs->short_at(chunk_index);
+  int cpref = cprefs->ushort_at(chunk_index);
   Handle mirror(THREAD, mirrors->obj_at(chunk_index));
 
   // Chunk can be partial full
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/verifier.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/verifier.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/classfile/verifier.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/classfile/verifier.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2145,6 +2145,7 @@
   // Get field name and signature
   Symbol* field_name = cp->name_ref_at(index);
   Symbol* field_sig = cp->signature_ref_at(index);
+  bool is_getfield = false;
 
   if (!SignatureVerifier::is_valid_type_signature(field_sig)) {
     class_format_error(
@@ -2195,11 +2196,9 @@
       break;
     }
     case Bytecodes::_getfield: {
+      is_getfield = true;
       stack_object_type = current_frame->pop_stack(
         target_class_type, CHECK_VERIFY(this));
-      for (int i = 0; i < n; i++) {
-        current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
-      }
       goto check_protected;
     }
     case Bytecodes::_putfield: {
@@ -2229,6 +2228,15 @@
     check_protected: {
       if (_this_type == stack_object_type)
         break; // stack_object_type must be assignable to _current_class_type
+      if (was_recursively_verified()) {
+        if (is_getfield) {
+          // Push field type for getfield.
+          for (int i = 0; i < n; i++) {
+            current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+          }
+        }
+        return;
+      }
       Symbol* ref_class_name =
         cp->klass_name_at(cp->klass_ref_index_at(index));
       if (!name_in_supers(ref_class_name, current_class()))
@@ -2257,6 +2265,12 @@
     }
     default: ShouldNotReachHere();
   }
+  if (is_getfield) {
+    // Push field type for getfield after doing protection check.
+    for (int i = 0; i < n; i++) {
+      current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+    }
+  }
 }
 
 // Look at the method's handlers.  If the bci is in the handler's try block
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/codeBlob.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/codeBlob.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/codeBlob.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/codeBlob.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -201,6 +201,11 @@
   return oop_maps()->find_map_at_offset((intptr_t) return_address - (intptr_t) code_begin());
 }
 
+void CodeBlob::print_code() {
+  HandleMark hm;
+  ResourceMark m;
+  Disassembler::decode(this, tty);
+}
 
 //----------------------------------------------------------------------------------------------------
 // Implementation of BufferBlob
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/codeBlob.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/codeBlob.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/codeBlob.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/codeBlob.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -190,6 +190,7 @@
   void print() const                             { print_on(tty); }
   virtual void print_on(outputStream* st) const;
   virtual void print_value_on(outputStream* st) const;
+  void print_code();
 
   // Deal with Disassembler, VTune, Forte, JvmtiExport, MemoryService.
   static void trace_new_stub(CodeBlob* blob, const char* name1, const char* name2 = "");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/dependencies.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/dependencies.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/dependencies.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/dependencies.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -29,6 +29,7 @@
 #include "ci/ciMethod.hpp"
 #include "code/dependencies.hpp"
 #include "compiler/compileLog.hpp"
+#include "oops/klass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/handles.inline.hpp"
@@ -896,8 +897,9 @@
     } else if (!k->oop_is_instance()) {
       return false; // no methods to find in an array type
     } else {
-      // Search class hierarchy first.
-      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature);
+      // Search class hierarchy first, skipping private implementations
+      // as they never override any inherited methods
+      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::skip_private);
       if (!Dependencies::is_concrete_method(m, k)) {
         // Check for re-abstraction of method
         if (!k->is_interface() && m != NULL && m->is_abstract()) {
@@ -907,7 +909,7 @@
           ClassHierarchyWalker wf(_participants, _num_participants);
           Klass* w = wf.find_witness_subtype(k);
           if (w != NULL) {
-            Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature);
+            Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature, Klass::skip_private);
             if (!Dependencies::is_concrete_method(wm, w)) {
               // Found a concrete subtype 'w' which does not override abstract method 'm'.
               // Bail out because 'm' could be called with 'w' as receiver (leading to an
@@ -967,8 +969,9 @@
   // the spot-checking version:
   Klass* find_witness_in(KlassDepChange& changes,
                          Klass* context_type,
-                           bool participants_hide_witnesses);
+                         bool participants_hide_witnesses);
  public:
+  bool witnessed_reabstraction_in_supers(Klass* k);
   Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) {
     assert(doing_subtype_search(), "must set up a subtype search");
     // When looking for unexpected concrete types,
@@ -1042,7 +1045,6 @@
 #define count_find_witness_calls() (0)
 #endif //PRODUCT
 
-
 Klass* ClassHierarchyWalker::find_witness_in(KlassDepChange& changes,
                                                Klass* context_type,
                                                bool participants_hide_witnesses) {
@@ -1080,15 +1082,13 @@
     }
   }
 
-  if (is_witness(new_type) &&
-      !ignore_witness(new_type)) {
+  if (is_witness(new_type) && !ignore_witness(new_type)) {
     return new_type;
   }
 
   return NULL;
 }
 
-
 // Walk hierarchy under a context type, looking for unexpected types.
 // Do not report participant types, and recursively walk beneath
 // them only if participants_hide_witnesses is false.
@@ -1207,6 +1207,32 @@
 #undef ADD_SUBCLASS_CHAIN
 }
 
+bool ClassHierarchyWalker::witnessed_reabstraction_in_supers(Klass* k) {
+  if (!k->oop_is_instance()) {
+    return false; // no methods to find in an array type
+  } else {
+    // Looking for a case when an abstract method is inherited into a concrete class.
+    if (Dependencies::is_concrete_klass(k) && !k->is_interface()) {
+      Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::skip_private);
+      if (m != NULL) {
+        return false; // no reabstraction possible: local method found
+      }
+      for (InstanceKlass* super = InstanceKlass::cast(k)->java_super(); super != NULL; super = super->java_super()) {
+        m = super->find_instance_method(_name, _signature, Klass::skip_private);
+        if (m != NULL) { // inherited method found
+          if (m->is_abstract() || m->is_overpass()) {
+            _found_methods[_num_participants] = m;
+            return true; // abstract method found
+          }
+          return false;
+        }
+      }
+      assert(false, "root method not found");
+      return true;
+    }
+    return false;
+  }
+}
 
 bool Dependencies::is_concrete_klass(Klass* k) {
   if (k->is_abstract())  return false;
@@ -1442,16 +1468,109 @@
   return num;
 }
 
+
+// Try to determine whether root method in some context is concrete or not based on the information about the unique method
+// in that context. It exploits the fact that concrete root method is always inherited into the context when there's a unique method.
+// Hence, unique method holder is always a supertype of the context class when root method is concrete.
+// Examples for concrete_root_method
+//      C (C.m uniqm)
+//      |
+//      CX (ctxk) uniqm is inherited into context.
+//
+//      CX (ctxk) (CX.m uniqm) here uniqm is defined in ctxk.
+// Examples for !concrete_root_method
+//      CX (ctxk)
+//      |
+//      C (C.m uniqm) uniqm is in subtype of ctxk.
+bool Dependencies::is_concrete_root_method(Method* uniqm, Klass* ctxk) {
+  if (uniqm == NULL) {
+    return false; // match Dependencies::is_concrete_method() behavior
+  }
+  // Theoretically, the "direction" of subtype check matters here.
+  // On one hand, in case of interface context with a single implementor, uniqm can be in a superclass of the implementor which
+  // is not related to context class.
+  // On another hand, uniqm could come from an interface unrelated to the context class, but right now it is not possible:
+  // it is required that uniqm->method_holder() is the participant (uniqm->method_holder() <: ctxk), hence a default method
+  // can't be used as unique.
+  if (ctxk->is_interface()) {
+    Klass* implementor = InstanceKlass::cast(ctxk)->implementor();
+    assert(implementor != ctxk, "single implementor only"); // should have been invalidated earlier
+    ctxk = implementor;
+  }
+  InstanceKlass* holder = uniqm->method_holder();
+  assert(!holder->is_interface(), "no default methods allowed");
+  assert(ctxk->is_subclass_of(holder) || holder->is_subclass_of(ctxk), "not related");
+  return ctxk->is_subclass_of(holder);
+}
+
 // If a class (or interface) has a unique concrete method uniqm, return NULL.
 // Otherwise, return a class that contains an interfering method.
-Klass* Dependencies::check_unique_concrete_method(Klass* ctxk, Method* uniqm,
-                                                    KlassDepChange* changes) {
-  // Here is a missing optimization:  If uniqm->is_final(),
-  // we don't really need to search beneath it for overrides.
-  // This is probably not important, since we don't use dependencies
-  // to track final methods.  (They can't be "definalized".)
+Klass* Dependencies::check_unique_concrete_method(Klass* ctxk,
+                                                  Method* uniqm,
+                                                  KlassDepChange* changes) {
   ClassHierarchyWalker wf(uniqm->method_holder(), uniqm);
-  return wf.find_witness_definer(ctxk, changes);
+  Klass* witness = wf.find_witness_definer(ctxk, changes);
+  if (witness != NULL) {
+    return witness;
+  }
+  if (!Dependencies::is_concrete_root_method(uniqm, ctxk) || changes != NULL) {
+    Klass* conck = find_witness_AME(ctxk, uniqm, changes);
+    if (conck != NULL) {
+      // Found a concrete subtype 'conck' which does not override abstract root method.
+      return conck;
+    }
+  }
+  return NULL;
+}
+
+// Search for AME.
+// There are two version of checks.
+//   1) Spot checking version(Classload time). Newly added class is checked for AME.
+//      Checks whether abstract/overpass method is inherited into/declared in newly added concrete class.
+//   2) Compile time analysis for abstract/overpass(abstract klass) root_m. The non uniqm subtrees are checked for concrete classes.
+Klass* Dependencies::find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes) {
+  if (m != NULL) {
+    if (changes != NULL) {
+      // Spot checking version.
+      ClassHierarchyWalker wf(m);
+      Klass* new_type = changes->new_type();
+      if (wf.witnessed_reabstraction_in_supers(new_type)) {
+        return new_type;
+      }
+    } else {
+      // Note: It is required that uniqm->method_holder() is the participant (see ClassHierarchyWalker::found_method()).
+      ClassHierarchyWalker wf(m->method_holder());
+      Klass* conck = wf.find_witness_subtype(ctxk);
+      if (conck != NULL) {
+        Method* cm = InstanceKlass::cast(conck)->find_instance_method(m->name(), m->signature(), Klass::skip_private);
+        if (!Dependencies::is_concrete_method(cm, conck)) {
+          return conck;
+        }
+      }
+    }
+  }
+  return NULL;
+}
+
+// This function is used by find_unique_concrete_method(non vtable based)
+// to check whether subtype method overrides the base method.
+static bool overrides(Method* sub_m, Method* base_m) {
+  assert(base_m != NULL, "base method should be non null");
+  if (sub_m == NULL) {
+    return false;
+  }
+  /**
+   *  If base_m is public or protected then sub_m always overrides.
+   *  If base_m is !public, !protected and !private (i.e. base_m is package private)
+   *  then sub_m should be in the same package as that of base_m.
+   *  For package private base_m this is conservative approach as it allows only subset of all allowed cases in
+   *  the jvm specification.
+   **/
+  if (base_m->is_public() || base_m->is_protected() ||
+      base_m->method_holder()->is_same_class_package(sub_m->method_holder())) {
+    return true;
+  }
+  return false;
 }
 
 // Find the set of all non-abstract methods under ctxk that match m.
@@ -1474,7 +1593,14 @@
       // (This can happen if m is inherited into ctxk and fm overrides it.)
       return NULL;
     }
+  } else if (Dependencies::find_witness_AME(ctxk, fm) != NULL) {
+    // Found a concrete subtype which does not override abstract root method.
+    return NULL;
+  } else if (!overrides(fm, m)) {
+    // Found method doesn't override abstract root method.
+    return NULL;
   }
+  assert(Dependencies::is_concrete_root_method(fm, ctxk) == Dependencies::is_concrete_method(m, ctxk), "mismatch");
 #ifndef PRODUCT
   // Make sure the dependency mechanism will pass this discovery:
   if (VerifyDependencies && fm != NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/dependencies.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/dependencies.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/dependencies.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/dependencies.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -290,6 +290,9 @@
   static bool is_concrete_method(Method* m, Klass* k);  // m is invocable
   static Klass* find_finalizable_subclass(Klass* k);
 
+  static bool is_concrete_root_method(Method* uniqm, Klass* ctxk);
+  static Klass* find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes = NULL);
+
   // These versions of the concreteness queries work through the CI.
   // The CI versions are allowed to skew sometimes from the VM
   // (oop-based) versions.  The cost of such a difference is a
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/nmethod.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/nmethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/nmethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/nmethod.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2612,6 +2612,7 @@
     ResourceMark rm(thread);
     CodeBlob* cb = CodeCache::find_blob(pc);
     assert(cb != NULL && cb == this, "");
+    ttyLocker ttyl;
     tty->print_cr("implicit exception happened at " INTPTR_FORMAT, pc);
     print();
     method()->print_codes();
@@ -2933,13 +2934,6 @@
                                               nul_chk_table_size());
 }
 
-void nmethod::print_code() {
-  HandleMark hm;
-  ResourceMark m;
-  Disassembler::decode(this);
-}
-
-
 #ifndef PRODUCT
 
 void nmethod::print_scopes() {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/nmethod.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/nmethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/code/nmethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/code/nmethod.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -695,7 +695,6 @@
 
   // printing support
   void print()                          const;
-  void print_code();
   void print_relocations()                        PRODUCT_RETURN;
   void print_pcs()                                PRODUCT_RETURN;
   void print_scopes()                             PRODUCT_RETURN;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/compiler/disassembler.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/compiler/disassembler.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/compiler/disassembler.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/compiler/disassembler.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -92,7 +92,7 @@
   {
     // Match "jvm[^/]*" in jvm_path.
     const char* base = buf;
-    const char* p = strrchr(buf, '/');
+    const char* p = strrchr(buf, *os::file_separator());
     if (p != NULL) lib_offset = p - base + 1;
     p = strstr(p ? p : base, "jvm");
     if (p != NULL)  jvm_offset = p - base;
@@ -117,7 +117,7 @@
     if (_library == NULL) {
       // 3. <home>/jre/lib/<arch>/hsdis-<arch>.so
       buf[lib_offset - 1] = '\0';
-      const char* p = strrchr(buf, '/');
+      const char* p = strrchr(buf, *os::file_separator());
       if (p != NULL) {
         lib_offset = p - buf + 1;
         strcpy(&buf[lib_offset], hsdis_library_name);
@@ -507,6 +507,7 @@
 
 
 void Disassembler::decode(CodeBlob* cb, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(cb, st);
   env.output()->print_cr("Decoding CodeBlob " PTR_FORMAT, cb);
@@ -514,12 +515,14 @@
 }
 
 void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(CodeCache::find_blob_unsafe(start), st, c);
   env.decode_instructions(start, end);
 }
 
 void Disassembler::decode(nmethod* nm, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(nm, st);
   env.output()->print_cr("Decoding compiled method " PTR_FORMAT ":", nm);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#if !defined(__clang_major__) && defined(__GNUC__)
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "classfile/metadataOnStackMark.hpp"
 #include "code/codeCache.hpp"
@@ -232,7 +228,7 @@
     if (!curr->is_young()) {
       gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
                              "incorrectly tagged (y: %d, surv: %d)",
-                             curr->bottom(), curr->end(),
+                             p2i(curr->bottom()), p2i(curr->end()),
                              curr->is_young(), curr->is_survivor());
       ret = false;
     }
@@ -361,8 +357,8 @@
     while (curr != NULL) {
       gclog_or_tty->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d",
                              HR_FORMAT_PARAMS(curr),
-                             curr->prev_top_at_mark_start(),
-                             curr->next_top_at_mark_start(),
+                             p2i(curr->prev_top_at_mark_start()),
+                             p2i(curr->next_top_at_mark_start()),
                              curr->age_in_surv_rate_group_cond());
       curr = curr->get_next_young_region();
     }
@@ -487,7 +483,7 @@
   RedirtyLoggedCardTableEntryClosure redirty;
   dcqs.apply_closure_to_all_completed_buffers(&redirty);
   dcqs.iterate_closure_all_threads(&redirty, false);
-  gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
+  gclog_or_tty->print_cr("Log entries = " SIZE_FORMAT ", dirty cards = %d.",
                          clear.num_processed(), orig_count);
   guarantee(redirty.num_processed() == clear.num_processed(),
             err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
@@ -2690,8 +2686,8 @@
         gclog_or_tty->print_cr("Region " HR_FORMAT ", "
                                "HS = " PTR_FORMAT ", should be " PTR_FORMAT,
                                HR_FORMAT_PARAMS(r),
-                               r->humongous_start_region(),
-                               _sh_region);
+                               p2i(r->humongous_start_region()),
+                               p2i(_sh_region));
         ++_failures;
       }
     }
@@ -3002,9 +2998,9 @@
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       if (_g1h->is_obj_dead_cond(obj, _vo)) {
         gclog_or_tty->print_cr("Root location " PTR_FORMAT " "
-                              "points to dead obj " PTR_FORMAT, p, (void*) obj);
+                               "points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
         if (_vo == VerifyOption_G1UseMarkWord) {
-          gclog_or_tty->print_cr("  Mark word: " PTR_FORMAT, (void*)(obj->mark()));
+          gclog_or_tty->print_cr("  Mark word: " INTPTR_FORMAT, (intptr_t)obj->mark());
         }
         obj->print_on(gclog_or_tty);
         _failures = true;
@@ -3052,9 +3048,9 @@
       // contains the nmethod
       if (!hrrs->strong_code_roots_list_contains(_nm)) {
         gclog_or_tty->print_cr("Code root location " PTR_FORMAT " "
-                              "from nmethod " PTR_FORMAT " not in strong "
-                              "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
-                              p, _nm, hr->bottom(), hr->end());
+                               "from nmethod " PTR_FORMAT " not in strong "
+                               "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
+                               p2i(p), p2i(_nm), p2i(hr->bottom()), p2i(hr->end()));
         _failures = true;
       }
     }
@@ -3110,7 +3106,7 @@
     _young_ref_counter_closure.reset_count();
     k->oops_do(&_young_ref_counter_closure);
     if (_young_ref_counter_closure.count() > 0) {
-      guarantee(k->has_modified_oops(), err_msg("Klass %p, has young refs but is not dirty.", k));
+      guarantee(k->has_modified_oops(), err_msg("Klass " PTR_FORMAT ", has young refs but is not dirty.", p2i(k)));
     }
   }
 };
@@ -3185,7 +3181,7 @@
       size_t word_sz = o->size();
       gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT
                           " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
-                          (void*) o, word_sz,
+                          p2i(o), word_sz,
                           _g1->isMarkedPrev(o),
                           _g1->isMarkedNext(o),
                           _hr->obj_allocated_since_prev_marking(o));
@@ -3194,7 +3190,7 @@
       int *val;
       for (cur = start; cur < end; cur++) {
         val = (int *) cur;
-        gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val);
+        gclog_or_tty->print("\t " PTR_FORMAT ": %d\n", p2i(val), *val);
       }
     }
   }
@@ -3232,7 +3228,7 @@
             gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] "
                                    "max_live_bytes " SIZE_FORMAT " "
                                    "< calculated " SIZE_FORMAT,
-                                   r->bottom(), r->end(),
+                                   p2i(r->bottom()), p2i(r->end()),
                                    r->max_live_bytes(),
                                  not_dead_yet_cl.live_bytes());
             _failures = true;
@@ -3449,10 +3445,10 @@
   st->print(" %-20s", "garbage-first heap");
   st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
             capacity()/K, used_unlocked()/K);
-  st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-            _hrm.reserved().start(),
-            _hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords,
-            _hrm.reserved().end());
+  st->print(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+            p2i(_hrm.reserved().start()),
+            p2i(_hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords),
+            p2i(_hrm.reserved().end()));
   st->cr();
   st->print("  region size " SIZE_FORMAT "K, ", HeapRegion::GrainBytes / K);
   uint young_regions = _young_list->length();
@@ -3470,7 +3466,7 @@
 
   // Print the per-region information.
   st->cr();
-  st->print_cr("Heap Regions: (Y=young(eden), SU=young(survivor), "
+  st->print_cr("Heap Regions: (E=young(eden), S=young(survivor), O=old, "
                "HS=humongous(starts), HC=humongous(continues), "
                "CS=collection set, F=free, TS=gc time stamp, "
                "PTAMS=previous top-at-mark-start, "
@@ -4450,7 +4446,7 @@
                                                oop old) {
   assert(obj_in_cs(old),
          err_msg("obj: " PTR_FORMAT " should still be in the CSet",
-                 (HeapWord*) old));
+                 p2i(old)));
   markOop m = old->mark();
   oop forward_ptr = old->forward_to_atomic(old);
   if (forward_ptr == NULL) {
@@ -4485,7 +4481,7 @@
     assert(old == forward_ptr || !obj_in_cs(forward_ptr),
            err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
                    "should not be in the CSet",
-                   (HeapWord*) old, (HeapWord*) forward_ptr));
+                   p2i(old), p2i(forward_ptr)));
     return forward_ptr;
   }
 }
@@ -5379,8 +5375,7 @@
         _par_scan_state->push_on_queue(p);
       } else {
         assert(!Metaspace::contains((const void*)p),
-               err_msg("Unexpectedly found a pointer from metadata: "
-                              PTR_FORMAT, p));
+               err_msg("Unexpectedly found a pointer from metadata: " PTR_FORMAT, p2i(p)));
         _copy_non_heap_obj_cl->do_oop(p);
       }
     }
@@ -6062,14 +6057,14 @@
 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
                                                HeapWord* tams, HeapWord* end) {
   guarantee(tams <= end,
-            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end));
+            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, p2i(tams), p2i(end)));
   HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
   if (result < end) {
     gclog_or_tty->cr();
     gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT,
-                           bitmap_name, result);
+                           bitmap_name, p2i(result));
     gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT,
-                           bitmap_name, tams, end);
+                           bitmap_name, p2i(tams), p2i(end));
     return false;
   }
   return true;
@@ -6406,10 +6401,10 @@
         !r->rem_set()->is_empty()) {
 
       if (G1TraceEagerReclaimHumongousObjects) {
-        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                                region_idx,
-                               obj->size()*HeapWordSize,
-                               r->bottom(),
+                               (size_t)obj->size()*HeapWordSize,
+                               p2i(r->bottom()),
                                r->region_num(),
                                r->rem_set()->occupied(),
                                r->rem_set()->strong_code_roots_list_length(),
@@ -6425,13 +6420,13 @@
     guarantee(obj->is_typeArray(),
               err_msg("Only eagerly reclaiming type arrays is supported, but the object "
                       PTR_FORMAT " is not.",
-                      r->bottom()));
+                      p2i(r->bottom())));
 
     if (G1TraceEagerReclaimHumongousObjects) {
-      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                              region_idx,
-                             obj->size()*HeapWordSize,
-                             r->bottom(),
+                             (size_t)obj->size()*HeapWordSize,
+                             p2i(r->bottom()),
                              r->region_num(),
                              r->rem_set()->occupied(),
                              r->rem_set()->strong_code_roots_list_length(),
@@ -6585,7 +6580,7 @@
   bool doHeapRegion(HeapRegion* r) {
     if (r->is_young()) {
       gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
-                             r->bottom(), r->end());
+                             p2i(r->bottom()), p2i(r->end()));
       _success = false;
     }
     return false;
@@ -6936,7 +6931,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
       hr->add_strong_code_root_locked(_nm);
@@ -6963,7 +6958,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       hr->remove_strong_code_root(_nm);
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -44,6 +44,7 @@
 #include "memory/barrierSet.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/sharedHeap.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/stack.hpp"
 
 // A "G1CollectedHeap" is an implementation of a java heap for HotSpot.
@@ -1150,21 +1151,11 @@
   // Do sanity check on the contents of the in-cset fast test table.
   bool check_cset_fast_test() PRODUCT_RETURN_( return true; );
 
-  // verify_region_sets() performs verification over the region
-  // lists. It will be compiled in the product code to be used when
-  // necessary (i.e., during heap verification).
   void verify_region_sets();
 
   // verify_region_sets_optional() is planted in the code for
-  // list verification in non-product builds (and it can be enabled in
-  // product builds by defining HEAP_REGION_SET_FORCE_VERIFY to be 1).
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() {
-    verify_region_sets();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  // list verification in debug builds.
+  void verify_region_sets_optional() { DEBUG_ONLY(verify_region_sets();) }
 
 #ifdef ASSERT
   bool is_on_master_free_list(HeapRegion* hr) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#ifndef __clang_major__
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "gc_implementation/g1/concurrentG1Refine.hpp"
 #include "gc_implementation/g1/concurrentMark.hpp"
@@ -288,7 +284,7 @@
   if (confidence_perc > 100) {
     confidence_perc = 100;
     warning("G1ConfidencePercent is set to a value that is too large, "
-            "it's been updated to %u", confidence_perc);
+            "it's been updated to " UINTX_FORMAT, confidence_perc);
   }
   _sigma = (double) confidence_perc / 100.0;
 
@@ -310,7 +306,7 @@
   if (reserve_perc > 50) {
     reserve_perc = 50;
     warning("G1ReservePercent is set to a value that is too large, "
-            "it's been updated to %u", reserve_perc);
+            "it's been updated to " UINTX_FORMAT, reserve_perc);
   }
   _reserve_factor = (double) reserve_perc / 100.0;
   // This will be set when the heap is expanded
@@ -1853,7 +1849,7 @@
     assert(csr->in_collection_set(), "bad CS");
     st->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
                  HR_FORMAT_PARAMS(csr),
-                 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
+                 p2i(csr->prev_top_at_mark_start()), p2i(csr->next_top_at_mark_start()),
                  csr->age_in_surv_rate_group_cond());
     csr = next;
   }
@@ -2219,7 +2215,7 @@
 void TraceGen0TimeData::print_summary_sd(const char* str,
                                          const NumberSeq* seq) const {
   print_summary(str, seq);
-  gclog_or_tty->print_cr("%+45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
+  gclog_or_tty->print_cr("%45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
                 "(num", seq->num(), seq->sd(), seq->maximum());
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -160,40 +160,43 @@
   } while (0)
 
 
-#define ergo_verbose(_tag_, _action_)                                   \
-  ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
+#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
+  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
-#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
-  ergo_verbose_common(_tag_, _action_, _extra_format_, 0, 0, 0, 0, 0, 0)
+#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
+  ergo_verbose6(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, "")
 
-#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
-                      _arg0_)                                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, 0, 0, 0, 0, 0)
+#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
+  ergo_verbose5(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, "")
+
+#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_)                           \
+  ergo_verbose4(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, "")
 
 #define ergo_verbose2(_tag_, _action_, _extra_format_,                  \
                       _arg0_, _arg1_)                                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, 0, 0, 0, 0)
+  ergo_verbose3(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, "")
 
-#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_)                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, 0, 0, 0)
+#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
+                      _arg0_)                                           \
+  ergo_verbose2(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, "")
 
-#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, 0, 0)
 
-#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, 0)
+#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
+  ergo_verbose1(_tag_, _action_, _extra_format_ "%s",                   \
+                "")
+
+#define ergo_verbose(_tag_, _action_)                                   \
+  ergo_verbose0(_tag_, _action_, "")
 
-#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -33,7 +33,7 @@
   bool doHeapRegion(HeapRegion* r) {
     EventG1HeapRegionInformation evt;
     evt.set_index(r->hrm_index());
-    // XXX TODO evt.set_type(r->get_trace_type());
+    evt.set_type(r->get_trace_type());
     evt.set_start((uintptr_t)r->bottom());
     evt.set_used(r->used());
     evt.commit();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -26,18 +26,12 @@
 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
 
 #include "gc_implementation/g1/heapRegion.hpp"
+#include "utilities/macros.hpp"
 
 // Large buffer for some cases where the output might be larger than normal.
 #define HRS_ERR_MSG_BUFSZ 512
 typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
 
-// Set verification will be forced either if someone defines
-// HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
-// asserts are compiled in.
-#ifndef HEAP_REGION_SET_FORCE_VERIFY
-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
-#endif // HEAP_REGION_SET_FORCE_VERIFY
-
 class hrs_ext_msg;
 
 class HRSMtSafeChecker : public CHeapObj<mtGC> {
@@ -145,13 +139,7 @@
   void verify_next_region(HeapRegion* hr);
   void verify_end();
 
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() {
-    verify();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  void verify_optional() { DEBUG_ONLY(verify();) }
 
   virtual void print_on(outputStream* out, bool print_contents = false);
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -401,7 +401,9 @@
   start_array()->set_covered_region(new_memregion);
   Universe::heap()->barrier_set()->resize_covered_region(new_memregion);
 
-  // ALWAYS do this last!!
+  // The update of the space's end is done by this call.  As that
+  // makes the new space available for concurrent allocation, this
+  // must be the last step when expanding.
   object_space()->initialize(new_memregion,
                              SpaceDecorator::DontClear,
                              SpaceDecorator::DontMangle);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -38,6 +38,7 @@
     // we need to ensure that it is copied (see comment in
     // ParScanClosure::do_oop_work).
     Klass* objK = obj->klass();
+    OrderAccess::loadload();
     markOop m = obj->mark();
     oop new_obj;
     if (m->is_marked()) { // Contains forwarding pointer.
@@ -101,6 +102,7 @@
       // overwritten with an overflow next pointer after the object is
       // forwarded.
       Klass* objK = obj->klass();
+      OrderAccess::loadload();
       markOop m = obj->mark();
       oop new_obj;
       if (m->is_marked()) { // Contains forwarding pointer.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/shared/mutableSpace.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/shared/mutableSpace.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -28,6 +28,7 @@
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "gc_implementation/shared/spaceDecorator.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
 #endif // INCLUDE_ALL_GCS
@@ -124,7 +125,11 @@
   }
 
   set_bottom(mr.start());
-  set_end(mr.end());
+  // When expanding concurrently with callers of cas_allocate, setting end
+  // makes the new space available for allocation by other threads.  So this
+  // assignment must follow all other configuration and initialization that
+  // might be done for expansion.
+  OrderAccess::release_store_ptr(end_addr(), mr.end());
 
   if (clear_space) {
     clear(mangle_space);
@@ -192,7 +197,11 @@
 // This version is lock-free.
 HeapWord* MutableSpace::cas_allocate(size_t size) {
   do {
-    HeapWord* obj = top();
+    // Read top before end, else the range check may pass when it shouldn't.
+    // If end is read first, other threads may advance end and top such that
+    // current top > old end and current top + size > current end.  Then
+    // pointer_delta underflows, allowing installation of top > current end.
+    HeapWord* obj = (HeapWord*)OrderAccess::load_ptr_acquire(top_addr());
     if (pointer_delta(end(), obj) >= size) {
       HeapWord* new_top = obj + size;
       HeapWord* result = (HeapWord*)Atomic::cmpxchg_ptr(new_top, top_addr(), obj);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/interpreter/interpreterRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/interpreter/interpreterRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1209,6 +1209,7 @@
         } else {
           // debugging suppport
           if (PrintSignatureHandlers) {
+            ttyLocker ttyl;
             tty->cr();
             tty->print_cr("argument handler #%d for: %s %s (fingerprint = " UINT64_FORMAT ", %d bytes generated)",
                           _handlers->length(),
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -238,6 +238,10 @@
  JfrJavaLog::log(tag_set, level, message, thread);
 JVM_END
 
+JVM_ENTRY_NO_ENV(jboolean, jfr_should_log(JNIEnv* env, jobject jvm, jint level))
+ return JfrJavaLog::should_log(level, thread) ? JNI_TRUE : JNI_FALSE;
+JVM_END
+
 JVM_ENTRY_NO_ENV(void, jfr_subscribe_log_level(JNIEnv* env, jobject jvm, jobject log_tag, jint id))
  JfrJavaLog::subscribe_log_level(log_tag, id, thread);
 JVM_END
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -67,6 +67,8 @@
 
 void JNICALL jfr_log(JNIEnv* env, jobject jvm, jint tag_set, jint level, jstring message);
 
+jboolean JNICALL jfr_should_log(JNIEnv* env, jobject jvm, jint level);
+
 void JNICALL jfr_retransform_classes(JNIEnv* env, jobject jvm, jobjectArray classes);
 
 void JNICALL jfr_set_enabled(JNIEnv* env, jobject jvm, jlong event_type_id, jboolean enabled);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -49,6 +49,7 @@
       (char*)"getTicksFrequency", (char*)"()J", (void*)jfr_elapsed_frequency,
       (char*)"subscribeLogLevel", (char*)"(Ljdk/jfr/internal/LogTag;I)V", (void*)jfr_subscribe_log_level,
       (char*)"log", (char*)"(IILjava/lang/String;)V", (void*)jfr_log,
+      (char*)"shouldLog", (char*)"(I)Z", (void*)jfr_should_log,
       (char*)"retransformClasses", (char*)"([Ljava/lang/Class;)V", (void*)jfr_retransform_classes,
       (char*)"setEnabled", (char*)"(JZ)V", (void*)jfr_set_enabled,
       (char*)"setFileNotification", (char*)"(J)V", (void*)jfr_set_file_notification,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -151,13 +151,12 @@
 }
 
 void MonitorInflateCauseConstant::serialize(JfrCheckpointWriter& writer) {
-  // XXX no such counters. implement?
-//  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
-//  writer.write_count(nof_entries);
-//  for (u4 i = 0; i < nof_entries; ++i) {
-//    writer.write_key(i);
-//    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
-//  }
+  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
+  writer.write_count(nof_entries);
+  for (u4 i = 0; i < nof_entries; ++i) {
+    writer.write_key(i);
+    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
+  }
 }
 
 void GCCauseConstant::serialize(JfrCheckpointWriter& writer) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -29,6 +29,7 @@
 const julong MAX_ADJUSTED_GLOBAL_BUFFER_SIZE = 1 * M;
 const julong MIN_ADJUSTED_GLOBAL_BUFFER_SIZE_CUTOFF = 512 * K;
 const julong MIN_GLOBAL_BUFFER_SIZE = 64 * K;
+const julong MAX_GLOBAL_BUFFER_SIZE = 2 * G;
 // implies at least 2 * MIN_GLOBAL_BUFFER SIZE
 const julong MIN_BUFFER_COUNT = 2;
 // MAX global buffer count open ended
@@ -36,6 +37,7 @@
 // MAX thread local buffer size == size of a single global buffer (runtime determined)
 // DEFAULT thread local buffer size = 2 * os page size (runtime determined)
 const julong MIN_THREAD_BUFFER_SIZE = 4 * K;
+const julong MAX_THREAD_BUFFER_SIZE = 2 * G;
 const julong MIN_MEMORY_SIZE = 1 * M;
 const julong DEFAULT_MEMORY_SIZE = 10 * M;
 
@@ -304,6 +306,11 @@
   options->global_buffer_size = div_total_by_units(options->memory_size, options->buffer_count);
   if (options->thread_buffer_size > options->global_buffer_size) {
     options->global_buffer_size = options->thread_buffer_size;
+    if (options->memory_size_configured) {
+      options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
+    } else {
+      options->memory_size = multiply(options->global_buffer_size, options->buffer_count);
+    }
     options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
   }
   assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
@@ -323,7 +330,8 @@
   assert(options->memory_size % os::vm_page_size() == 0, "invariant");
   assert(options->global_buffer_size % os::vm_page_size() == 0, "invariant");
   assert(options->thread_buffer_size % os::vm_page_size() == 0, "invariant");
-  assert(options->buffer_count > 0, "invariant");
+  assert(options->buffer_count >= MIN_BUFFER_COUNT, "invariant");
+  assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
 }
 #endif
 
@@ -428,6 +436,10 @@
     default:
       default_size(options);
   }
+  if (options->buffer_count < MIN_BUFFER_COUNT ||
+      options->global_buffer_size < options->thread_buffer_size) {
+    return false;
+  }
   DEBUG_ONLY(assert_post_condition(options);)
   return true;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -32,6 +32,8 @@
 extern const julong MIN_GLOBAL_BUFFER_SIZE;
 extern const julong MIN_MEMORY_SIZE;
 extern const julong MIN_THREAD_BUFFER_SIZE;
+extern const julong MAX_GLOBAL_BUFFER_SIZE;
+extern const julong MAX_THREAD_BUFFER_SIZE;
 
 struct JfrMemoryOptions {
   julong memory_size;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -390,34 +390,41 @@
   return value;
 }
 
-template <typename Argument>
-static void log_lower_than_min_value(Argument& memory_argument, julong min_value) {
+static const char higher_than_msg[] = "This value is higher than the maximum size limited ";
+static const char lower_than_msg[] = "This value is lower than the minimum size required ";
+template <typename Argument, bool lower>
+static void log_out_of_range_value(Argument& memory_argument, julong min_value) {
+  const char* msg = lower ? lower_than_msg : higher_than_msg;
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "This value is lower than the minimum size required " JULONG_FORMAT "%c",
+      "%s" JULONG_FORMAT "%c", msg,
       divide_with_user_unit(memory_argument, min_value),
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "This value is lower than the minimum size required " JULONG_FORMAT,
+    "%s" JULONG_FORMAT, msg,
     divide_with_user_unit(memory_argument, min_value));
 }
 
+static const char default_val_msg[] = "Value default for option ";
+static const char specified_val_msg[] = "Value specified for option ";
 template <typename Argument>
 static void log_set_value(Argument& memory_argument) {
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "Value specified for option \"%s\" is " JULONG_FORMAT "%c",
+      "%s\"%s\" is " JULONG_FORMAT "%c",
+      memory_argument.is_set() ? specified_val_msg: default_val_msg,
       memory_argument.name(),
       memory_argument.value()._val,
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "Value specified for option \"%s\" is " JULONG_FORMAT,
+    "%s\"%s\" is " JULONG_FORMAT,
+    memory_argument.is_set() ? specified_val_msg: default_val_msg,
     memory_argument.name(), memory_argument.value()._val);
 }
 
@@ -538,6 +545,10 @@
         return false;
       }
     }
+  } else if (options.thread_buffer_size_configured && options.memory_size_configured) {
+    if (!ensure_first_gteq_second(_dcmd_memorysize, _dcmd_threadbuffersize)) {
+      return false;
+    }
   }
   return true;
 }
@@ -606,7 +617,7 @@
 static bool ensure_gteq(Argument& memory_argument, const jlong value) {
   if ((jlong)memory_argument.value()._size < value) {
     log_set_value(memory_argument);
-    log_lower_than_min_value(memory_argument, value);
+    log_out_of_range_value<Argument, true>(memory_argument, value);
     return false;
   }
   return true;
@@ -637,6 +648,30 @@
   return true;
 }
 
+template <typename Argument>
+static bool ensure_lteq(Argument& memory_argument, const jlong value) {
+  if ((jlong)memory_argument.value()._size > value) {
+    log_set_value(memory_argument);
+    log_out_of_range_value<Argument, false>(memory_argument, value);
+    return false;
+  }
+  return true;
+}
+
+static bool ensure_valid_maximum_sizes() {
+  if (_dcmd_globalbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_globalbuffersize, MAX_GLOBAL_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  if (_dcmd_threadbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_threadbuffersize, MAX_THREAD_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Starting with the initial set of memory values from the user,
  * sanitize, enforce min/max rules and adjust to a set of consistent options.
@@ -644,7 +679,7 @@
  * Adjusted memory sizes will be page aligned.
  */
 bool JfrOptionSet::adjust_memory_options() {
-  if (!ensure_valid_minimum_sizes()) {
+  if (!ensure_valid_minimum_sizes() || !ensure_valid_maximum_sizes()) {
     return false;
   }
   JfrMemoryOptions options;
@@ -653,6 +688,24 @@
     return false;
   }
   if (!JfrMemorySizer::adjust_options(&options)) {
+    if (options.buffer_count < MIN_BUFFER_COUNT || options.global_buffer_size < options.thread_buffer_size) {
+      log_set_value(_dcmd_memorysize);
+      log_set_value(_dcmd_globalbuffersize);
+      tty->print_cr("%s \"%s\" is " JLONG_FORMAT,
+        _dcmd_numglobalbuffers.is_set() ? specified_val_msg: default_val_msg,
+        _dcmd_numglobalbuffers.name(), _dcmd_numglobalbuffers.value());
+       log_set_value(_dcmd_threadbuffersize);
+      if (options.buffer_count < MIN_BUFFER_COUNT) {
+        tty->print_cr("numglobalbuffers " JULONG_FORMAT " is less than minimal value " JULONG_FORMAT,
+          options.buffer_count, MIN_BUFFER_COUNT);
+        tty->print_cr("Decrease globalbuffersize/threadbuffersize or increase memorysize");
+      } else {
+        tty->print_cr("globalbuffersize " JULONG_FORMAT " is less than threadbuffersize" JULONG_FORMAT,
+          options.global_buffer_size, options.thread_buffer_size);
+        tty->print_cr("Decrease globalbuffersize or increase memorysize or adjust global/threadbuffersize");
+      }
+      return false;
+    }
     if (!check_for_ambiguity(_dcmd_memorysize, _dcmd_globalbuffersize, _dcmd_numglobalbuffers)) {
       return false;
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -139,3 +139,7 @@
   // log_tag_sets[tag_set].log_tag_set->log((LogLevelType)level, s);
   tty->print_cr("JFR: %s", s);
 }
+
+bool JfrJavaLog::should_log(jint level, TRAPS) {
+  return LogJFR;
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -43,6 +43,7 @@
  public:
   static void subscribe_log_level(jobject log_tag, jint id, TRAPS);
   static void log(jint tag_set, jint level, jstring message, TRAPS);
+  static bool should_log(jint level, TRAPS);
 };
 
 #endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/libadt/set.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/libadt/set.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/libadt/set.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/libadt/set.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -66,7 +66,7 @@
 // The caller must deallocate the string.
 char *Set::setstr() const
 {
-  if( !this ) return os::strdup("{no set}");
+  if( this == NULL ) return os::strdup("{no set}");
   Set &set = clone();           // Virtually copy the basic set.
   set.Sort();                   // Sort elements for in-order retrieval
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -45,9 +45,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class Chunk_t, class FreeList_t>
-size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
-
-template <class Chunk_t, class FreeList_t>
 TreeChunk<Chunk_t, FreeList_t>* TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(Chunk_t* fc) {
   // Do some assertion checking here.
   return (TreeChunk<Chunk_t, FreeList_t>*) fc;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -163,15 +163,17 @@
   Chunk_t* prev() const { return Chunk_t::prev(); }
   size_t size() const volatile { return Chunk_t::size(); }
 
-  static size_t min_size() {
-    return _min_tree_chunk_size;
-  }
+  static size_t min_size();
 
   // debugging
   void verify_tree_chunk_list() const;
   void assert_is_mangled() const;
 };
 
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize;
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::min_size() { return _min_tree_chunk_size; }
 
 template <class Chunk_t, class FreeList_t>
 class BinaryTreeDictionary: public FreeBlockDictionary<Chunk_t> {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/filemap.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/filemap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/filemap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/filemap.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -452,7 +452,7 @@
       // close and remove the file. See bug 6372906.
       close();
       remove(_full_path);
-      fail_stop("Unable to write to shared archive file.", NULL);
+      fail_stop("Unable to write to shared archive file.");
     }
   }
   _file_offset += nbytes;
@@ -471,7 +471,7 @@
       // that the written file is the correct length.
       _file_offset -= 1;
       if (lseek(_fd, (long)_file_offset, SEEK_SET) < 0) {
-        fail_stop("Unable to seek.", NULL);
+        fail_stop("Unable to seek.");
       }
       char zero = 0;
       write_bytes(&zero, 1);
@@ -542,7 +542,7 @@
   // other reserved memory (like the code cache).
   ReservedSpace rs(size, os::vm_allocation_granularity(), false, requested_addr);
   if (!rs.is_reserved()) {
-    fail_continue(err_msg("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr));
+    fail_continue("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr);
     return rs;
   }
   // the reserved virtual memory is for mapping class data sharing archive
@@ -566,7 +566,7 @@
                               requested_addr, size, si->_read_only,
                               si->_allow_exec);
   if (base == NULL || base != si->_base) {
-    fail_continue(err_msg("Unable to map %s shared space at required address.", shared_region_name[i]));
+    fail_continue("Unable to map %s shared space at required address.", shared_region_name[i]);
     return NULL;
   }
 #ifdef _WINDOWS
@@ -605,7 +605,7 @@
 
 void FileMapInfo::assert_mark(bool check) {
   if (!check) {
-    fail_stop("Mark mismatch while restoring from shared file.", NULL);
+    fail_stop("Mark mismatch while restoring from shared file.");
   }
 }
 
@@ -748,7 +748,7 @@
 void FileMapInfo::stop_sharing_and_unmap(const char* msg) {
   FileMapInfo *map_info = FileMapInfo::current_info();
   if (map_info) {
-    map_info->fail_continue(msg);
+    map_info->fail_continue("%s", msg);
     for (int i = 0; i < MetaspaceShared::n_regions; i++) {
       if (map_info->_header->_space[i]._base != NULL) {
         map_info->unmap_region(i);
@@ -756,6 +756,6 @@
       }
     }
   } else if (DumpSharedSpaces) {
-    fail_stop(msg, NULL);
+    fail_stop("%s", msg);
   }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/filemap.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/filemap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/memory/filemap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/memory/filemap.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -196,8 +196,8 @@
   bool  remap_shared_readonly_as_readwrite();
 
   // Errors.
-  static void fail_stop(const char *msg, ...);
-  static void fail_continue(const char *msg, ...);
+  static void fail_stop(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
+  static void fail_continue(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
 
   // Return true if given address is in the mapped shared space.
   bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/oops/instanceKlass.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/oops/instanceKlass.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/oops/instanceKlass.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/oops/instanceKlass.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1494,18 +1494,22 @@
 
 // find_instance_method looks up the name/signature in the local methods array
 // and skips over static methods
-Method* InstanceKlass::find_instance_method(
-    Array<Method*>* methods, Symbol* name, Symbol* signature) {
+Method* InstanceKlass::find_instance_method(Array<Method*>* methods,
+                                            Symbol* name,
+                                            Symbol* signature,
+                                            PrivateLookupMode private_mode) {
   Method* meth = InstanceKlass::find_method_impl(methods, name, signature,
-                                                 find_overpass, skip_static, find_private);
+                                                 find_overpass, skip_static, private_mode);
   assert(((meth == NULL) || !meth->is_static()), "find_instance_method should have skipped statics");
   return meth;
 }
 
 // find_instance_method looks up the name/signature in the local methods array
 // and skips over static methods
-Method* InstanceKlass::find_instance_method(Symbol* name, Symbol* signature) {
-    return InstanceKlass::find_instance_method(methods(), name, signature);
+Method* InstanceKlass::find_instance_method(Symbol* name,
+                                            Symbol* signature,
+                                            PrivateLookupMode private_mode) {
+  return InstanceKlass::find_instance_method(methods(), name, signature, private_mode);
 }
 
 // Find looks up the name/signature in the local methods array
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/oops/instanceKlass.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/oops/instanceKlass.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/oops/instanceKlass.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/oops/instanceKlass.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -526,8 +526,11 @@
   static Method* find_method(Array<Method*>* methods, Symbol* name, Symbol* signature);
 
   // find a local method, but skip static methods
-  Method* find_instance_method(Symbol* name, Symbol* signature);
-  static Method* find_instance_method(Array<Method*>* methods, Symbol* name, Symbol* signature);
+  Method* find_instance_method(Symbol* name, Symbol* signature,
+                               PrivateLookupMode private_mode);
+  static Method* find_instance_method(Array<Method*>* methods,
+                                      Symbol* name, Symbol* signature,
+                                      PrivateLookupMode private_mode);
 
   // find a local method (returns NULL if not found)
   Method* find_local_method(Symbol* name, Symbol* signature,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/chaitin.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/chaitin.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/chaitin.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/chaitin.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2084,7 +2084,7 @@
 // Dump a register name into a buffer.  Be intelligent if we get called
 // before allocation is complete.
 char *PhaseChaitin::dump_register( const Node *n, char *buf  ) const {
-  if( !this ) {                 // Not got anything?
+  if( this == NULL ) {          // Not got anything?
     sprintf(buf,"N%d",n->_idx); // Then use Node index
   } else if( _node_regs ) {
     // Post allocation, use direct mappings, no LRG info available
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/compile.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/compile.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/compile.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/compile.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2086,13 +2086,16 @@
 // They were inserted during parsing (see add_safepoint()) to make
 // infinite loops without calls or exceptions visible to root, i.e.,
 // useful.
-void Compile::remove_root_to_sfpts_edges() {
+void Compile::remove_root_to_sfpts_edges(PhaseIterGVN& igvn) {
   Node *r = root();
   if (r != NULL) {
     for (uint i = r->req(); i < r->len(); ++i) {
       Node *n = r->in(i);
       if (n != NULL && n->is_SafePoint()) {
         r->rm_prec(i);
+        if (n->outcnt() == 0) {
+          igvn.remove_dead_node(n);
+        }
         --i;
       }
     }
@@ -2156,7 +2159,7 @@
 
   // Now that all inlining is over, cut edge from root to loop
   // safepoints
-  remove_root_to_sfpts_edges();
+  remove_root_to_sfpts_edges(igvn);
 
   // Remove the speculative part of types and clean up the graph from
   // the extra CastPP nodes whose only purpose is to carry them. Do
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/compile.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/compile.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/compile.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/compile.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -959,7 +959,7 @@
   void inline_incrementally(PhaseIterGVN& igvn);
   void inline_string_calls(bool parse_time);
   void inline_boxing_calls(PhaseIterGVN& igvn);
-  void remove_root_to_sfpts_edges();
+  void remove_root_to_sfpts_edges(PhaseIterGVN& igvn);
 
   // Matching, CFG layout, allocation, code generation
   PhaseCFG*         cfg()                       { return _cfg; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/output.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/output.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/opto/output.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/opto/output.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -28,6 +28,7 @@
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compileBroker.hpp"
+#include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "memory/allocation.inline.hpp"
 #include "opto/callnode.hpp"
@@ -1510,8 +1511,17 @@
       }
 
 #ifdef ASSERT
-      if (n->size(_regalloc) < (current_offset-instr_offset)) {
+      uint n_size = n->size(_regalloc);
+      if (n_size < (current_offset-instr_offset)) {
+        MachNode* mach = n->as_Mach();
         n->dump();
+        mach->dump_format(_regalloc, tty);
+        tty->print_cr(" n_size (%d), current_offset (%d), instr_offset (%d)", n_size, current_offset, instr_offset);
+        Disassembler::decode(cb->insts_begin() + instr_offset, cb->insts_begin() + current_offset + 1, tty);
+        tty->print_cr(" ------------------- ");
+        BufferBlob* blob = this->scratch_buffer_blob();
+        address blob_begin = blob->content_begin();
+        Disassembler::decode(blob_begin, blob_begin + n_size + 1, tty);
         assert(false, "wrong size of mach node");
       }
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jni.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jni.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jni.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jni.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1454,7 +1454,7 @@
                                env, clazz, (uintptr_t) methodID);
 #endif /* USDT2 */
   jobject obj = NULL;
-  DT_RETURN_MARK(NewObjectA, jobject, (const jobject)obj);
+  DT_RETURN_MARK(NewObjectA, jobject, (const jobject&)obj);
 
   instanceOop i = alloc_object(clazz, CHECK_NULL);
   obj = JNIHandles::make_local(env, i);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvm.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvm.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvm.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvm.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1772,6 +1772,18 @@
         found = (k() == inner_klass);
         if (found && ooff != 0) {
           ok = i_cp->klass_at(ooff, CHECK_NULL);
+          if (!ok->oop_is_instance()) {
+            // If the outer class is not an instance klass then it cannot have
+            // declared any inner classes.
+            ResourceMark rm(THREAD);
+            Exceptions::fthrow(
+              THREAD_AND_LOCATION,
+              vmSymbols::java_lang_IncompatibleClassChangeError(),
+              "%s and %s disagree on InnerClasses attribute",
+              ok->external_name(),
+              k->external_name());
+            return NULL;
+          }
           outer_klass = instanceKlassHandle(thread, ok);
           *inner_is_member = true;
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiEnvBase.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiEnvBase.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1092,7 +1092,7 @@
           // If the monitor has no owner, then a non-suspended contending
           // thread could potentially change the state of the monitor by
           // entering it. The JVM/TI spec doesn't allow this.
-          if (owning_thread == NULL && !at_safepoint &
+          if (owning_thread == NULL && !at_safepoint &&
               !JvmtiEnv::is_thread_fully_suspended(pending_thread, true, &debug_bits)) {
             if (ret.owner != NULL) {
               destroy_jni_reference(calling_thread, ret.owner);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiImpl.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiImpl.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiImpl.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiImpl.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -64,6 +64,7 @@
 
 class GrowableElement : public CHeapObj<mtInternal> {
 public:
+  virtual ~GrowableElement() {}
   virtual address getCacheValue()          =0;
   virtual bool equals(GrowableElement* e)  =0;
   virtual bool lessThan(GrowableElement *e)=0;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiTagMap.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiTagMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/jvmtiTagMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/jvmtiTagMap.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -2805,6 +2805,7 @@
   return true;
 }
 
+#ifdef ASSERT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2819,6 +2820,7 @@
     return false;
   }
 }
+#endif // #ifdef ASSERT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/methodHandles.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/methodHandles.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/prims/methodHandles.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/prims/methodHandles.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -972,6 +972,13 @@
       return mname;
     }
   }
+
+  if (new_index < len) {
+    assert(JNIHandles::resolve(this->at(new_index)) == NULL, "sanity");
+    // destroy the old handle
+    JNIHandles::destroy_weak_global(this->at(new_index));
+  }
+
   // Not found, push the new one, or reuse empty slot
   this->at_put_grow(new_index, mem_name_wref);
   return new_mem_name;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/arguments.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/arguments.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/arguments.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/arguments.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -3314,6 +3314,12 @@
     } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) {
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStderr", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStdout", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, true);
     } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
 #if defined(DTRACE_ENABLED)
       FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/globals.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/globals.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/globals.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/globals.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -2712,6 +2712,12 @@
   product(bool, DisplayVMOutputToStdout, false,                             \
           "If DisplayVMOutput is true, display all VM output to stdout")    \
                                                                             \
+  product(bool, ErrorFileToStderr, false,                                   \
+          "If true, error data is printed to stderr instead of a file")     \
+                                                                            \
+  product(bool, ErrorFileToStdout, false,                                   \
+          "If true, error data is printed to stdout instead of a file")     \
+                                                                            \
   product(bool, UseHeavyMonitors, false,                                    \
           "use heavyweight instead of lightweight Java monitors")           \
                                                                             \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/mutex.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/mutex.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/mutex.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/mutex.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -283,16 +283,6 @@
   return x & 0x7FFFFFFF ;
 }
 
-static inline jint MarsagliaXOR (jint * const a) {
-  jint x = *a ;
-  if (x == 0) x = UNS(a)|1 ;
-  x ^= x << 6;
-  x ^= ((unsigned)x) >> 21;
-  x ^= x << 7 ;
-  *a = x ;
-  return x & 0x7FFFFFFF ;
-}
-
 static int Stall (int its) {
   static volatile jint rv = 1 ;
   volatile int OnFrame = 0 ;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/perfData.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/perfData.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/perfData.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/perfData.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -288,7 +288,7 @@
     void *_valuep;
 
     PerfData(CounterNS ns, const char* name, Units u, Variability v);
-    ~PerfData();
+    virtual ~PerfData();
 
     // create the entry for the PerfData item in the PerfData memory region.
     // this region is maintained separately from the PerfData objects to
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/safepoint.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/safepoint.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/safepoint.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/safepoint.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -1122,6 +1122,7 @@
   if( nm->is_at_poll_return(real_return_addr) ) {
     // See if return type is an oop.
     bool return_oop = nm->method()->is_returning_oop();
+    HandleMark hm(thread());
     Handle return_value;
     if (return_oop) {
       // The oop result has been saved on the stack together with all
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/sharedRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/sharedRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/sharedRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/sharedRuntime.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -720,6 +720,7 @@
 #endif
 
   if (t == NULL) {
+    ttyLocker ttyl;
     tty->print_cr("MISSING EXCEPTION HANDLER for pc " INTPTR_FORMAT " and handler bci %d", ret_pc, handler_bci);
     tty->print_cr("   Exception:");
     exception->print();
@@ -2637,8 +2638,8 @@
     BufferBlob*  buf = buffer_blob(); // the temporary code buffer in CodeCache
     if (buf != NULL) {
       CodeBuffer buffer(buf);
-      double locs_buf[20];
-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
+      struct { double data[20]; } locs_buf;
+      buffer.insts()->initialize_shared_locs((relocInfo*)&locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
       MacroAssembler _masm(&buffer);
 
       // Fill in the signature array, for the calling-convention call.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/synchronizer.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/synchronizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/synchronizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/synchronizer.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -216,7 +216,9 @@
      }
   }
 
-  ObjectSynchronizer::inflate(THREAD, object)->exit (true, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              object,
+                              inflate_cause_vm_internal)->exit(true, THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -258,7 +260,9 @@
   // must be non-zero to avoid looking like a re-entrant lock,
   // and must not look locked either.
   lock->set_displaced_header(markOopDesc::unused_mark());
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_monitor_enter)->enter(THREAD);
 }
 
 // This routine is used to handle interpreter/compiler slow case
@@ -288,7 +292,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   return monitor->complete_exit(THREAD);
 }
@@ -301,7 +307,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   monitor->reenter(recursion, THREAD);
 }
@@ -316,7 +324,7 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
   THREAD->set_current_pending_monitor_is_from_java(false);
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD, obj(), inflate_cause_jni_enter)->enter(THREAD);
   THREAD->set_current_pending_monitor_is_from_java(true);
 }
 
@@ -342,7 +350,9 @@
   }
   assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj);
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj,
+                                                       inflate_cause_jni_exit);
   // If this thread has locked the object, exit the monitor.  Note:  can't use
   // monitor->check(CHECK); must exit even if an exception is pending.
   if (monitor->check(THREAD)) {
@@ -385,7 +395,10 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_wait);
+
   DTRACE_MONITOR_WAIT_PROBE(monitor, obj(), THREAD, millis);
   monitor->wait(millis, true, THREAD);
 
@@ -404,7 +417,9 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectSynchronizer::inflate(THREAD, obj()) -> wait(millis, false, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_wait)->wait(millis, false, THREAD) ;
 }
 
 void ObjectSynchronizer::notify(Handle obj, TRAPS) {
@@ -417,7 +432,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notify(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notify(THREAD);
 }
 
 // NOTE: see comment of notify()
@@ -431,7 +448,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notifyAll(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notifyAll(THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -686,7 +705,7 @@
   }
 
   // Inflate the monitor to set hash code
-  monitor = ObjectSynchronizer::inflate(Self, obj);
+  monitor = ObjectSynchronizer::inflate(Self, obj, inflate_cause_hash_code);
   // Load displaced header and check it has hash code
   mark = monitor->header();
   assert (mark->is_neutral(), "invariant") ;
@@ -1183,12 +1202,29 @@
     TEVENT (omFlush) ;
 }
 
+const char* ObjectSynchronizer::inflate_cause_name(const InflateCause cause) {
+  switch (cause) {
+    case inflate_cause_vm_internal:    return "VM Internal";
+    case inflate_cause_monitor_enter:  return "Monitor Enter";
+    case inflate_cause_wait:           return "Monitor Wait";
+    case inflate_cause_notify:         return "Monitor Notify";
+    case inflate_cause_hash_code:      return "Monitor Hash Code";
+    case inflate_cause_jni_enter:      return "JNI Monitor Enter";
+    case inflate_cause_jni_exit:       return "JNI Monitor Exit";
+    default:
+      ShouldNotReachHere();
+  }
+  return "Unknown";
+}
+
 static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
-                                       const oop obj) {
+                                       const oop obj,
+                                       const ObjectSynchronizer::InflateCause cause) {
   assert(event != NULL, "invariant");
   assert(event->should_commit(), "invariant");
   event->set_monitorClass(obj->klass());
   event->set_address((uintptr_t)(void*)obj);
+  event->set_cause((u1)cause);
   event->commit();
 }
 
@@ -1200,7 +1236,9 @@
     assert(mark->monitor()->header()->is_neutral(), "monitor must record a good object header");
     return mark->monitor();
   }
-  return ObjectSynchronizer::inflate(Thread::current(), obj);
+  return ObjectSynchronizer::inflate(Thread::current(),
+                                     obj,
+                                     inflate_cause_vm_internal);
 }
 
 
@@ -1208,7 +1246,9 @@
 // multiple locks occupy the same $ line.  Padding might be appropriate.
 
 
-ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self, oop object) {
+ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self,
+                                                  oop object,
+                                                  const InflateCause cause) {
   // Inflate mutates the heap ...
   // Relaxing assertion for bug 6320749.
   assert (Universe::verify_in_progress() ||
@@ -1347,7 +1387,7 @@
             }
           }
           if (event.should_commit()) {
-            post_monitor_inflate_event(&event, object);
+            post_monitor_inflate_event(&event, object, cause);
           }
           return m ;
       }
@@ -1400,7 +1440,7 @@
         }
       }
       if (event.should_commit()) {
-        post_monitor_inflate_event(&event, object);
+        post_monitor_inflate_event(&event, object, cause);
       }
       return m ;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/synchronizer.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/synchronizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/synchronizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/synchronizer.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -42,6 +42,18 @@
     owner_none,
     owner_other
   } LockOwnership;
+
+  typedef enum {
+    inflate_cause_vm_internal = 0,
+    inflate_cause_monitor_enter = 1,
+    inflate_cause_wait = 2,
+    inflate_cause_notify = 3,
+    inflate_cause_hash_code = 4,
+    inflate_cause_jni_enter = 5,
+    inflate_cause_jni_exit = 6,
+    inflate_cause_nof = 7 // Number of causes
+  } InflateCause;
+
   // exit must be implemented non-blocking, since the compiler cannot easily handle
   // deoptimization at monitor exit. Hence, it does not take a Handle argument.
 
@@ -90,9 +102,10 @@
   static void omFlush   (Thread * Self) ;
 
   // Inflate light weight monitor to heavy weight monitor
-  static ObjectMonitor* inflate(Thread * Self, oop obj);
+  static ObjectMonitor* inflate(Thread * Self, oop obj, const InflateCause cause);
   // This version is only for internal use
   static ObjectMonitor* inflate_helper(oop obj);
+  static const char* inflate_cause_name(const InflateCause cause);
 
   // Returns the identity hash value for an oop
   // NOTE: It may cause monitor inflation
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/vframe.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/vframe.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/runtime/vframe.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/runtime/vframe.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -397,6 +397,7 @@
     // as it were a native compiled frame (no Java-level assumptions).
 #ifdef ASSERT
     if (WizardMode) {
+      ttyLocker ttyl;
       tty->print_cr("Error in fill_from_frame: pc_desc for "
                     INTPTR_FORMAT " not found or invalid at %d",
                     p2i(_frame.pc()), decode_offset);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/debug.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/debug.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/debug.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/debug.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -447,12 +447,13 @@
 extern "C" void disnm(intptr_t p) {
   Command c("disnm");
   CodeBlob* cb = CodeCache::find_blob((address) p);
-  nmethod* nm = cb->as_nmethod_or_null();
-  if (nm) {
-    nm->print();
-    Disassembler::decode(nm);
-  } else {
-    cb->print();
+  if (cb != NULL) {
+    nmethod* nm = cb->as_nmethod_or_null();
+    if (nm != NULL) {
+      nm->print();
+    } else {
+      cb->print();
+    }
     Disassembler::decode(cb);
   }
 }
@@ -687,6 +688,7 @@
   tty->print_cr("  pns(void* sp, void* fp, void* pc)  - print native (i.e. mixed) stack trace. E.g.");
   tty->print_cr("                   pns($sp, $rbp, $pc) on Linux/amd64 and Solaris/amd64 or");
   tty->print_cr("                   pns($sp, $ebp, $pc) on Linux/x86 or");
+  tty->print_cr("                   pns($sp, $fp, $pc)  on Linux/AArch64 or");
   tty->print_cr("                   pns($sp, 0, $pc)    on Linux/ppc64 or");
   tty->print_cr("                   pns($sp + 0x7ff, 0, $pc) on Solaris/SPARC");
   tty->print_cr("                 - in gdb do 'set overload-resolution off' before calling pns()");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/debug.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/debug.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/debug.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/debug.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -156,6 +156,9 @@
   #define assert_if_no_error(cond,msg)
 #endif // #ifdef ASSERT
 
+#define precond(p)   assert(p, "precond")
+#define postcond(p)  assert(p, "postcond")
+
 // guarantee is like assert except it's always executed -- use it for
 // cheap tests that catch errors that would otherwise be hard to find.
 // guarantee is also used for Verify options.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/decoder_elf.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/decoder_elf.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/decoder_elf.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/decoder_elf.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -37,7 +37,7 @@
     _opened_elf_files = NULL;
     _decoder_status = no_error;
   }
-  ~ElfDecoder();
+  virtual ~ElfDecoder();
 
   bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/decoder.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/decoder.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/decoder.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/decoder.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -32,6 +32,7 @@
 
 class AbstractDecoder : public CHeapObj<mtInternal> {
 public:
+  virtual ~AbstractDecoder() {}
   // status code for decoding native C frame
   enum decoder_status {
          not_available = -10,  // real decoder is not available
@@ -78,7 +79,7 @@
     _decoder_status = not_available;
   }
 
-  ~NullDecoder() {};
+  virtual ~NullDecoder() {};
 
   virtual bool decode(address pc, char* buf, int buflen, int* offset,
     const char* modulepath = NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -29,6 +29,11 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+// Needed for INT64_C and UINT64_C with ISO C99 libraries (see JDK-8272214)
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+
 #ifdef TARGET_COMPILER_gcc
 # include "utilities/globalDefinitions_gcc.hpp"
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions_visCPP.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions_visCPP.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -77,6 +77,15 @@
 // pointer is stored as integer value.
 #define NULL_WORD NULL
 
+// Some MS Visual Studio versions do not seem to have INT64_C and UINT64_C
+// even with __STDC_CONSTANT_MACROS defined.
+#ifndef INT64_C
+#define INT64_C(c)  (c ## i64)
+#endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## ui64)
+#endif
+
 // Compiler-specific primitive types
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/hashtable.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/hashtable.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/hashtable.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/hashtable.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -94,8 +94,6 @@
   return false;
 }
 
-template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
-
 // Create a new table and using alternate hash code, populate the new table
 // with the existing elements.   This can be used to change the hash code
 // and could in the future change the size of the table.
@@ -219,7 +217,7 @@
       if (*top + entry_size() > end) {
         report_out_of_shared_space(SharedMiscData);
       }
-      *p = (BasicHashtableEntry<F>*)memcpy(*top, *p, entry_size());
+      *p = (BasicHashtableEntry<F>*)memcpy(*top, (void*)*p, entry_size());
       *top += entry_size();
     }
   }
@@ -333,7 +331,7 @@
   if (*top + len > end) {
     report_out_of_shared_space(SharedMiscData);
   }
-  _buckets = (HashtableBucket<F>*)memcpy(*top, _buckets, len);
+  _buckets = (HashtableBucket<F>*)memcpy(*top, (void*)_buckets, len);
   *top += len;
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/hashtable.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/hashtable.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/hashtable.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/hashtable.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -314,8 +314,8 @@
 
   // Function to move these elements into the new table.
   void move_to(RehashableHashtable<T, F>* new_table);
-  static bool use_alternate_hashcode()  { return _seed != 0; }
-  static juint seed()                    { return _seed; }
+  static bool use_alternate_hashcode();
+  static juint seed();
 
   static int literal_size(Symbol *symbol);
   static int literal_size(oop oop);
@@ -333,6 +333,9 @@
   static juint _seed;
 };
 
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::seed() { return _seed; };
+template <class T, MEMFLAGS F> bool  RehashableHashtable<T, F>::use_alternate_hashcode() { return _seed != 0; };
 
 //  Verions of hashtable where two handles are used to compute the index.
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/ostream.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/ostream.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/ostream.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/ostream.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -673,7 +673,10 @@
 static int vsnprintf_wrapper(char* buf, size_t len, const char* fmt, ...) {
   va_list args;
   va_start(args, fmt);
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
   int result = os::vsnprintf(buf, len, fmt, args);
+PRAGMA_DIAG_POP
   va_end(args);
   return result;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/taskqueue.hpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/taskqueue.hpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/taskqueue.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/taskqueue.hpp	2021-10-20 10:12:18.000000000 +0000
@@ -430,9 +430,7 @@
 }
 
 template<class E, MEMFLAGS F, unsigned int N>
-GenericTaskQueue<E, F, N>::~GenericTaskQueue() {
-  FREE_C_HEAP_ARRAY(E, _elems, F);
-}
+GenericTaskQueue<E, F, N>::~GenericTaskQueue() {}
 
 // OverflowTaskQueue is a TaskQueue that also includes an overflow stack for
 // elements that do not fit in the TaskQueue.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/vmError.cpp openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/vmError.cpp
--- openjdk-8-8u292-b10/=unpacked-tar11=/src/share/vm/utilities/vmError.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/src/share/vm/utilities/vmError.cpp	2021-10-20 10:12:18.000000000 +0000
@@ -984,12 +984,16 @@
     }
   }
 
-  // print to screen
+  // Part 1: print an abbreviated version (the '#' section) to stdout.
   if (!out_done) {
     first_error->_verbose = false;
 
-    staticBufferStream sbs(buffer, sizeof(buffer), &out);
-    first_error->report(&sbs);
+    // Suppress this output if we plan to print Part 2 to stdout too.
+    // No need to have the "#" section twice.
+    if (!(ErrorFileToStdout && out.fd() == 1)) {
+      staticBufferStream sbs(buffer, sizeof(buffer), &out);
+      first_error->report(&sbs);
+    }
 
     out_done = true;
 
@@ -997,6 +1001,7 @@
     first_error->_current_step_info = "";   // reset current_step string
   }
 
+  // Part 2: print a full error log file (optionally to stdout or stderr).
   // print to error log file
   if (!log_done) {
     first_error->_verbose = true;
@@ -1004,19 +1009,26 @@
     // see if log file is already open
     if (!log.is_open()) {
       // open log file
-      int fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
-      if (fd != -1) {
-        out.print_raw("# An error report file with more information is saved as:\n# ");
-        out.print_raw_cr(buffer);
-
-        log.set_fd(fd);
+      int fd;
+      if (ErrorFileToStdout) {
+        fd = 1;
+      } else if (ErrorFileToStderr) {
+        fd = 2;
       } else {
-        out.print_raw_cr("# Can not save log file, dump to screen..");
-        log.set_fd(defaultStream::output_fd());
-        /* Error reporting currently needs dumpfile.
-         * Maybe implement direct streaming in the future.*/
-        transmit_report_done = true;
+        fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
+        if (fd != -1) {
+          out.print_raw("# An error report file with more information is saved as:\n# ");
+          out.print_raw_cr(buffer);
+
+        } else {
+          out.print_raw_cr("# Can not save log file, dump to screen..");
+          fd = defaultStream::output_fd();
+          /* Error reporting currently needs dumpfile.
+           * Maybe implement direct streaming in the future.*/
+          transmit_report_done = true;
+        }
       }
+      log.set_fd(fd);
     }
 
     staticBufferStream sbs(buffer, O_BUFLEN, &log);
@@ -1034,7 +1046,7 @@
       }
     }
 
-    if (log.fd() != defaultStream::output_fd()) {
+    if (log.fd() > 3) {
       close(log.fd());
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	2021-10-20 10:12:18.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+super public class TestRangeCheckExceptionHandlerLoop
+	version 51:0
+{
+
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+/* This method has an irreducible loop, with 2 entries, one is the exception handler
+
+    static void test(boolean flag, int[] array, Exception exception) throws Exception {
+        int i = 0;
+        if (flag) {
+            try {
+                throw exception;
+            } catch(Exception e) {
+                array[i] = 0;
+                i++;
+            }
+        }
+        if (i < 10) {
+            throw exception; // caught by exception handler above as well
+        }
+    }
+*/
+public static Method test:"(Z[ILjava/lang/Exception;)V"
+	throws java/lang/Exception
+	stack 3 locals 5
+{
+		iconst_0;
+		istore_3;
+		iload_0;
+		ifeq	L17;
+		try t0;
+		aload_2;
+		athrow;
+		endtry t0;
+		catch t0 java/lang/Exception;
+		catch t1 java/lang/Exception;
+		stack_frame_type full;
+		locals_map int, class "[I", class java/lang/Exception, int;
+		stack_map class java/lang/Exception;
+		astore	4;
+		aload_1;
+		iload_3;
+		iconst_0;
+		iastore;
+		iinc	3, 1;
+	L17:	stack_frame_type same;
+		iload_3;
+		bipush	10;
+		if_icmpge	L25;
+		try t1;
+		aload_2;
+		athrow;
+		endtry t1;
+	L25:	stack_frame_type same;
+		return;
+}
+} // end Class TestRangeCheckExceptionHandlerLoop
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	2021-10-20 10:12:18.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8134883
+ * @summary C1's range check elimination breaks with a non-natural loop that an exception handler as one entry
+ * @compile TestRangeCheckExceptionHandlerLoop.jasm
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckExceptionHandlerLoopMain
+ */
+
+public class TestRangeCheckExceptionHandlerLoopMain {
+    public static void main(String[] args) throws Exception {
+        Exception exception = new Exception();
+        int[] array = new int[10];
+        for (int i = 0; i < 20000; i++) {
+            TestRangeCheckExceptionHandlerLoop.test(false, array, exception);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/stringopts/TestStringObjectInitialization.java openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/stringopts/TestStringObjectInitialization.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-10-20 10:12:18.000000000 +0000
@@ -59,6 +59,11 @@
         // Trigger C2's string concatenation optimization
         add(s + Arrays.toString(sArray) + " const ");
     }
+
+    public void reset() {
+        // Reset string to avoid OOMEs
+        myString = "";
+    }
 }
 
 class Runner implements Runnable {
@@ -70,8 +75,9 @@
 
     public void run(){
         String[] array = {"a", "b", "c"};
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100_000; ++i) {
             test.run("a", array);
+            test.reset();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-10-20 10:12:18.000000000 +0000
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031752
  * @summary speculative traps need to be cleaned up at GC
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx512M TestSpecTrapClassUnloading
  *
  */
 
@@ -45,7 +45,7 @@
         MemoryChunk other;
         long[] array;
         MemoryChunk(MemoryChunk other) {
-            other = other;
+            this.other = other;
             array = new long[1024 * 1024 * 1024];
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/arguments/TestAggressiveHeap.java openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/arguments/TestAggressiveHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/arguments/TestAggressiveHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/arguments/TestAggressiveHeap.java	2021-10-20 10:12:18.000000000 +0000
@@ -51,13 +51,18 @@
     // Option requires at least 256M, else error during option processing.
     private static final long minMemory = 256 * 1024 * 1024;
 
+    // Setting the heap to half of the physical memory is not suitable for
+    // a test environment with many tests running concurrently, setting to
+    // half of the required size instead.
+    private static final String heapSizeOption = "-Xmx128M";
+
     // bool UseParallelGC := true {product}
     private static final String parallelGCPattern =
         " *bool +UseParallelGC *:= *true +\\{product\\}";
 
     private static void testFlag() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-            option, "-XX:+PrintFlagsFinal", "-version");
+            option, heapSizeOption, "-XX:+PrintFlagsFinal", "-version");
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/g1/TestHumongousShrinkHeap.java openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/g1/TestHumongousShrinkHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/g1/TestHumongousShrinkHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/g1/TestHumongousShrinkHeap.java	2021-10-20 10:12:18.000000000 +0000
@@ -49,19 +49,29 @@
     private static final int REGION_SIZE = 1024 * 1024; // 1M
     private static final int LISTS_COUNT = 10;
     private static final int HUMON_SIZE = Math.round(.9f * REGION_SIZE);
-    private static final long AVAILABLE_MEMORY
-                              = Runtime.getRuntime().freeMemory();
-    private static final int HUMON_COUNT
-                             = (int) ((AVAILABLE_MEMORY / HUMON_SIZE)
-            / LISTS_COUNT);
 
+    private static final long TOTAL_MEMORY = Runtime.getRuntime().totalMemory();
+    private static final long MAX_MEMORY = Runtime.getRuntime().maxMemory();
+
+    private static final int HUMON_COUNT = (int) ((TOTAL_MEMORY / HUMON_SIZE) / LISTS_COUNT);
 
     public static void main(String[] args) {
-        System.out.format("Running with %s max heap size. "
-                + "Will allocate humongous object of %s size %d times.%n",
-                MemoryUsagePrinter.humanReadableByteCount(AVAILABLE_MEMORY, false),
-                MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
-                HUMON_COUNT
+        if (HUMON_COUNT == 0) {
+            System.out.println("Skipped. Heap is too small");
+            return;
+        }
+
+        if (TOTAL_MEMORY + REGION_SIZE * HUMON_COUNT > MAX_MEMORY) {
+            System.out.println("Skipped. Initial heap size is to close to max heap size.");
+            return;
+        }
+
+        System.out.format("Running with %s initial heap size of %s maximum heap size. "
+                          + "Will allocate humongous object of %s size %d times.%n",
+                          MemoryUsagePrinter.humanReadableByteCount(TOTAL_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(MAX_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
+                          HUMON_COUNT
         );
         new TestHumongousShrinkHeap().test();
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-10-20 10:12:18.000000000 +0000
@@ -96,11 +96,18 @@
                 .getActualMemoryUsage();
 
         test.allocate();
-        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD;
-             i++) {
+        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD; i++) {
             SurvivorAlignmentTestMain.WHITE_BOX.youngGC();
         }
 
+        // Sometimes we see that data unrelated to the test has been allocated during
+        // the loop. This data is included in the expectedMemoryUsage since we look
+        // through all threads to see what they allocated. If this data is still in
+        // the survivor area however, it should not be included in expectedMemoryUsage
+        // since the verification below only look at what's in tenured space.
+        expectedMemoryUsage -= SurvivorAlignmentTestMain.getAlignmentHelper(
+                                   SurvivorAlignmentTestMain.HeapSpace.SURVIVOR)
+                                   .getActualMemoryUsage();
         test.verifyMemoryUsage(expectedMemoryUsage);
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/Makefile openjdk-8-8u312-b07/=unpacked-tar11=/test/Makefile
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/Makefile	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/Makefile	2021-10-20 10:12:18.000000000 +0000
@@ -288,6 +288,9 @@
 # Ignore tests are not run and completely silent about it
 JTREG_IGNORE_OPTION = -ignore:quiet
 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
+# Multiply by 4 the timeout factor
+JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
+JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
 # Add any extra options
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Set other vm and test options
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/8001071/Test8001071.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/8001071/Test8001071.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/8001071/Test8001071.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/8001071/Test8001071.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import sun.misc.Unsafe;
-import java.lang.reflect.Field;
-
-@SuppressWarnings("sunapi")
-public class Test8001071 {
-    public static Unsafe unsafe;
-
-    static {
-        try {
-            Field f = Unsafe.class.getDeclaredField("theUnsafe");
-            f.setAccessible(true);
-            unsafe = (Unsafe) f.get(null);
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String args[]) {
-        unsafe.getObject(new Test8001071(), Short.MAX_VALUE);
-    }
-
-}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/8001071/Test8001071.sh openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/8001071/Test8001071.sh
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/8001071/Test8001071.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/8001071/Test8001071.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-
-## @test
-## @bug 8001071
-## @summary Add simple range check into VM implemenation of Unsafe access methods 
-## @compile Test8001071.java
-## @run shell Test8001071.sh
-## @author filipp.zhinkin@oracle.com
-
-VERSION=`${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>&1`
-
-if [ -n "`echo $VERSION | grep debug`" -o -n "`echo $VERSION | grep jvmg`" ]; then
-        echo "Build type check passed"
-        echo "Continue testing"
-else
-        echo "Fastdebug build is required for this test"
-        exit 0
-fi
-
-${TESTJAVA}/bin/java -cp ${TESTCLASSES} ${TESTVMOPTS} Test8001071 2>&1
-
-HS_ERR_FILE=hs_err_pid*.log
-
-if [ ! -f $HS_ERR_FILE ]
-then
-    echo "hs_err_pid log file was not found"
-    echo "Test failed"
-    exit 1
-fi
-
-grep "assert(byte_offset < p_size) failed: Unsafe access: offset.*> object's size.*" $HS_ERR_FILE
-
-if [ "0" = "$?" ];
-then
-    echo "Range check assertion failed as expected"
-    echo "Test passed"
-    exit 0
-else
-    echo "Range check assertion was not failed"
-    echo "Test failed"
-    exit 1
-fi
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/CompressedOops/CompressedClassPointers.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/CompressedOops/CompressedClassPointers.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-10-20 10:12:18.000000000 +0000
@@ -44,10 +44,10 @@
         output.shouldHaveExitValue(0);
     }
 
-    public static void smallHeapTestWith3G() throws Exception {
+    public static void smallHeapTestWith1G() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "-XX:+UnlockDiagnosticVMOptions",
-            "-XX:CompressedClassSpaceSize=3g",
+            "-XX:CompressedClassSpaceSize=1g",
             "-Xmx128m",
             "-XX:+PrintCompressedOopsMode",
             "-XX:+VerifyBeforeGC", "-version");
@@ -128,7 +128,7 @@
            }
       }
       smallHeapTest();
-      smallHeapTestWith3G();
+      smallHeapTestWith1G();
       largeHeapTest();
       largePagesTest();
       sharingTest();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	2021-10-20 10:12:18.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, SAP. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8220786
+ * @summary Test ErrorFileToStderr and ErrorFileToStdout
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.Platform;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class ErrorFileRedirectTest {
+
+  public static void do_test(boolean redirectStdout, boolean redirectStderr) throws Exception {
+
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-Xmx64M",
+            "-XX:ErrorHandlerTest=12",
+            "-XX:" + (redirectStdout ? "+" : "-") + "ErrorFileToStdout",
+            "-XX:" + (redirectStderr ? "+" : "-") + "ErrorFileToStderr",
+            "-version");
+
+    OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+    // we should have crashed with a SIGSEGV
+    output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+    output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
+
+    // If no redirection happened, we should find a mention of the file in the output.
+    String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);
+    if (redirectStdout == false && redirectStderr == false) {
+      if (hs_err_file == null) {
+        throw new RuntimeException("Expected hs-err file but none found.");
+      } else {
+        System.out.println("Found hs error file mentioned as expected: " + hs_err_file);
+      }
+    } else {
+      if (hs_err_file != null) {
+        throw new RuntimeException("Found unexpected mention of hs-err file (we did redirect the output so no file should have been written).");
+      } else {
+        System.out.println("No mention of an hs-err file - ok! ");
+      }
+    }
+
+    // Check the output. Note that since stderr was specified last it has preference if both are set.
+    if (redirectStdout == true && redirectStderr == false) {
+      output_detail.stdoutShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stderrShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stderr - ok! ");
+    } else if (redirectStderr == true) {
+      output_detail.stderrShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stdoutShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stdout - ok! ");
+    }
+
+    System.out.println("OK.");
+
+  }
+
+  public static void main(String[] args) throws Exception {
+    if (!Platform.isDebugBuild()) {
+      System.out.println("Skip on non-debug builds since we need '-XX:ErrorHandlerTest'");
+      return;
+    }
+    do_test(false, false);
+    do_test(false, true);
+    do_test(true, false);
+    do_test(true, true);
+  }
+
+}
+
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/Metaspace/FragmentMetaspace.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/Metaspace/FragmentMetaspace.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/Metaspace/FragmentMetaspace.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/Metaspace/FragmentMetaspace.java	2021-10-20 10:12:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -25,7 +25,7 @@
  * @test
  * @library /runtime/testlibrary
  * @build GeneratedClassLoader
- * @run main/othervm/timeout=200 FragmentMetaspace
+ * @run main/othervm/timeout=200 -Xmx300m FragmentMetaspace
  */
 
 import java.io.IOException;
@@ -38,25 +38,34 @@
  */
 public class FragmentMetaspace {
 
+    public static Class<?> c;
+
     public static void main(String... args) {
-        runGrowing(Long.valueOf(System.getProperty("time", "80000")));
+        runGrowing(Long.valueOf(System.getProperty("time", "80000")),
+            Integer.valueOf(System.getProperty("iterations", "200")));
         // try to clean up and unload classes to decrease
         // class verification time in debug vm
         System.gc();
     }
 
-    private static void runGrowing(long time) {
+    private static void runGrowing(long time, int iterations) {
         long startTime = System.currentTimeMillis();
-        for (int i = 0; System.currentTimeMillis() < startTime + time; ++i) {
+        for (int i = 0; System.currentTimeMillis() < startTime + time && i < iterations; ++i) {
             try {
                 GeneratedClassLoader gcl = new GeneratedClassLoader();
 
-                Class<?> c = gcl.getGeneratedClasses(i, 100)[0];
+                // getGeneratedClasses throws a RuntimeException in cases where
+                // the javac exit code is not 0. If the original reason for the exception is
+                // a "java.lang.OutOfMemoryError: Java heap space",
+                // increase the heap size in the @run tag and rerun the test.
+                // The heap can be exhausted by this test, but heap exhaustion
+                // is not a failure mode of this test and should be ignored.
+                c = gcl.getGeneratedClasses(i, 100)[0];
                 c.newInstance();
                 c = null;
 
                 gcl = null;
-            } catch (IOException|InstantiationException|IllegalAccessException ex) {
+            } catch (IOException | InstantiationException | IllegalAccessException ex) {
                 throw new RuntimeException(ex);
             }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/StackGap/testme.sh openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/StackGap/testme.sh
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/StackGap/testme.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/StackGap/testme.sh	2021-10-20 10:12:18.000000000 +0000
@@ -49,7 +49,10 @@
     exit 0;
 fi
 
-CFLAGS="-m${VM_BITS}"
+if [ "x${VM_CPU}" != "xaarch64" ];
+then
+    CFLAGS="-m${VM_BITS}"
+fi
 
 LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
@@ -67,7 +70,8 @@
 $gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
-    -ljvm -lpthread exestack-gap.c
+    exestack-gap.c \
+    -ljvm -lpthread
 
 ./stack-gap || exit $?
 ./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/StackTrace/LargeClassTest.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/StackTrace/LargeClassTest.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/StackTrace/LargeClassTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/StackTrace/LargeClassTest.java	2021-10-20 10:12:18.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8194246
+ * @summary JVM crashes on stack trace for large number of methods.
+ * @library /testlibrary
+ * @run main LargeClassTest
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class LargeClassTest implements Opcodes {
+    public static void main(String... args) throws Exception {
+        writeClassFile();
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "-cp", ".",  "Large");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+    }
+
+    // Writes a Large class with > signed 16 bit int methods
+    public static void writeClassFile() throws Exception {
+
+        ClassWriter cw = new ClassWriter(0);
+        FieldVisitor fv;
+        MethodVisitor mv;
+        AnnotationVisitor av0;
+
+        cw.visit(52, ACC_PUBLIC + ACC_SUPER, "Large", null, "java/lang/Object", null);
+
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(1, 1);
+          mv.visitEnd();
+        }
+        {
+          // public static void main(String[] args) {
+          //     Large large = new Large();
+          //     large.f_1(55);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+          mv.visitCode();
+          mv.visitTypeInsn(NEW, "Large");
+          mv.visitInsn(DUP);
+          mv.visitMethodInsn(INVOKESPECIAL, "Large", "<init>", "()V", false);
+          mv.visitVarInsn(ASTORE, 1);
+          mv.visitVarInsn(ALOAD, 1);
+          mv.visitIntInsn(BIPUSH, 55);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_1", "(I)I", false);
+          mv.visitInsn(POP);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+
+        // Write 33560 methods called f_$i
+        for (int i = 1000; i < 34560; i++)
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "f_" + i, "()V", null, null);
+          mv.visitCode();
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(0, 1);
+          mv.visitEnd();
+        }
+        {
+          // public int f_1(int prior) {
+          //   int total = prior + new java.util.Random(1).nextInt();
+          //   return total + f_2(total);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_1", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ILOAD, 1);
+          mv.visitTypeInsn(NEW, "java/util/Random");
+          mv.visitInsn(DUP);
+          mv.visitInsn(LCONST_1);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/util/Random", "<init>", "(J)V", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/Random", "nextInt", "()I", false);
+          mv.visitInsn(IADD);
+          mv.visitVarInsn(ISTORE, 2);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_2", "(I)I", false);
+          mv.visitInsn(IADD);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(5, 3);
+          mv.visitEnd();
+        }
+        {
+          // public int f_2(int total) {
+          //   System.out.println(java.util.Arrays.toString(Thread.currentThread().getStackTrace()));
+          //   return 10;
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_2", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+          mv.visitMethodInsn(INVOKESTATIC, "java/lang/Thread", "currentThread", "()Ljava/lang/Thread;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Thread", "getStackTrace", "()[Ljava/lang/StackTraceElement;", false);
+          mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "toString", "([Ljava/lang/Object;)Ljava/lang/String;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+          mv.visitIntInsn(BIPUSH, 10);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+        cw.visitEnd();
+
+        try (FileOutputStream fos = new FileOutputStream(new File("Large.class"))) {
+          fos.write(cw.toByteArray());
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/Unsafe/RangeCheck.java openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/Unsafe/RangeCheck.java
--- openjdk-8-8u292-b10/=unpacked-tar11=/test/runtime/Unsafe/RangeCheck.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/test/runtime/Unsafe/RangeCheck.java	2021-10-20 10:12:18.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8001071
+ * @summary Add simple range check into VM implemenation of Unsafe access methods
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+import sun.misc.Unsafe;
+
+public class RangeCheck {
+
+    public static void main(String args[]) throws Exception {
+        if (!Platform.isDebugBuild()) {
+            System.out.println("Testing assert which requires a debug build. Passing silently.");
+            return;
+        }
+
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                true,
+                "-Xmx32m",
+                "-XX:-TransmitErrorReport",
+                DummyClassWithMainRangeCheck.class.getName());
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldMatch("assert\\(byte_offset < p_size\\) failed: Unsafe access: offset \\d+ > object's size \\d+");
+    }
+
+    public static class DummyClassWithMainRangeCheck {
+        public static void main(String args[]) throws Exception {
+            Unsafe unsafe = Utils.getUnsafe();
+            unsafe.getObject(new DummyClassWithMainRangeCheck(), Short.MAX_VALUE);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar11=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar11=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar11=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar11=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar2=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar2=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/.hg_archival.txt	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 repo: a61af66fc99eb5ec9d50c05b0c599757b1289ceb
-node: 2a6952bb390975722d73580d1dc3cb6ac69b76b0
+node: 8aac6d08b58e31e4938a32c2662bf822d87a5440
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/.hgtags openjdk-8-8u312-b07/=unpacked-tar2=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar2=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/.hgtags	2021-08-09 15:12:52.000000000 +0000
@@ -1355,3 +1355,22 @@
 f206e4bfcef993ce5a75ed54612f045ca047abd3 jdk8u292-b07
 85c5bc8157df45d7351c388f18ab65297b5bdd01 jdk8u292-b08
 65907019826ad9fe7d13df531e0c108cc1f179b0 jdk8u292-b09
+2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-b10
+2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-ga
+a435c913c8ce30f0487d05cfec1d9be3fcc57f10 jdk8u302-b00
+d24969e49a6af3353c84b9a0f9aedd4736156b66 jdk8u302-b01
+8a152c8e9f14e3bdeebd7bf4e8eb2a6e8f9bbb7c jdk8u302-b02
+99e4a82f17e8debc5225d1c8834acdac673aa676 jdk8u302-b03
+362d99aef38e6e179061f221df20bbb9f65b8f89 jdk8u302-b04
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u302-b05
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u312-b00
+782f3b88b5ba7d420e6c5894c19f9bf1980df239 jdk8u302-b06
+78dfe32cac588b01e28792d42e761fa35a80e8f9 jdk8u302-b07
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-b08
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-ga
+2f7a380c9a0ac0cf20fdb17d7b6a135da05b5d04 jdk8u312-b01
+4735f3031e239dfd76c0ed2ce25c8f1cc9bd7c1f jdk8u312-b02
+a6da205dfd9f0d71dae93a310652e29d830c95ee jdk8u312-b03
+21394894714b0fb17e6015483e4658f75e30bbc5 jdk8u312-b04
+e7fc0c4f478e78e2ef40b8d098c02a958e385227 jdk8u312-b05
+e2ac513ec7b343f596861645f0696bc6f0fb4364 jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/defs.make openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/defs.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/defs.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/defs.make	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -142,36 +142,28 @@
         OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
       endif
 
-      ifeq ($(OBJCOPY),)
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
-        ENABLE_FULL_DEBUG_SYMBOLS=0
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-      else
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: AIX .debuginfo files will be produced by copying debug object.")
 
-        # Library stripping policies for .debuginfo configs:
-        #   all_strip - strips everything from the library
-        #   min_strip - strips most stuff from the library; leaves minimum symbols
-        #   no_strip  - does not strip the library at all
-        #
-        # Oracle security policy requires "all_strip". A waiver was granted on
-        # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-        #
-        # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
-        #
-        STRIP_POLICY ?= min_strip
+      # Library stripping policies for .debuginfo configs:
+      #   all_strip - strips everything from the library
+      #   min_strip - strips most stuff from the library; leaves minimum symbols
+      #   no_strip  - does not strip the library at all
+      #
+      # Oracle security policy requires "all_strip". A waiver was granted on
+      # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+      #
+      # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+      #
+      STRIP_POLICY ?= min_strip
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-        ZIP_DEBUGINFO_FILES ?= 1
+      ZIP_DEBUGINFO_FILES ?= 1
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-      endif
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
     endif # ENABLE_FULL_DEBUG_SYMBOLS=1
   endif # BUILD_FLAVOR
 endif # JDK_6_OR_EARLIER
@@ -185,13 +177,13 @@
 
 # client and server subdirectories have symbolic links to ../libjsig.so
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
-#  else
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
-#  endif
-#endif
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
+  else
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+  endif
+endif
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -199,25 +191,25 @@
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 ifeq ($(JVM_VARIANT_CLIENT),true)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 # Serviceability Binaries
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/jsig.make	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -64,9 +64,9 @@
 	$(QUIETLY) $(CXX) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) -o $@ $< -ldl
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
 #  ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #  else
@@ -75,11 +75,13 @@
 #    # implied else here is no stripping at all
 #    endif
 #  endif
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-#	$(RM) $(LIBJSIG_DEBUGINFO)
-#  endif
-#endif
+  ifneq ($(STRIP_POLICY),no_strip)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+	$(RM) $(LIBJSIG_DEBUGINFO)
+    endif
+  endif
+endif
 
 install_jsig: $(LIBJSIG)
 	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/saproc.make	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -88,16 +88,16 @@
 	           -o $@                                                \
 	           -lthread_db
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-  ifeq ($(STRIP_POLICY),all_strip)
-	$(QUIETLY) $(STRIP) $@
-  else
-    ifeq ($(STRIP_POLICY),min_strip)
-	$(QUIETLY) $(STRIP) -g $@
-    # implied else here is no stripping at all
-    endif
-  endif
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
+#  ifeq ($(STRIP_POLICY),all_strip)
+#	$(QUIETLY) $(STRIP) $@
+#  else
+#    ifeq ($(STRIP_POLICY),min_strip)
+#	$(QUIETLY) $(STRIP) -g $@
+#    # implied else here is no stripping at all
+#    endif
+#  endif
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
 	$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
 	$(RM) $(LIBSAPROC_DEBUGINFO)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/vm.make openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/vm.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/aix/makefiles/vm.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/aix/makefiles/vm.make	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2020 SAP SE. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -329,9 +329,9 @@
 #           fi 							        \
 #	}
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJVM_DEBUGINFO)
 #    ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #    else
@@ -340,11 +340,13 @@
 #      # implied else here is no stripping at all
 #      endif
 #    endif
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
-#	$(RM) $(LIBJVM_DEBUGINFO)
-#  endif
-#endif
+    ifneq ($(STRIP_POLICY),no_strip)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+	$(RM) $(LIBJVM_DEBUGINFO)
+      endif
+    endif
+endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
 DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/gcc.make	2021-08-09 15:12:52.000000000 +0000
@@ -313,10 +313,10 @@
 
 # Work around some compiler bugs.
 ifeq ($(USE_CLANG), true)
-  ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 2), 1)
-    OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
-    OPT_CFLAGS/unsafe.o += -O1
-  endif
+  # Known to fail with clang <= 7.0; 
+  # do no optimize these on later clang until verified
+  OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
+  OPT_CFLAGS/unsafe.o += -O1
 else
   # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation.
   ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
@@ -362,7 +362,15 @@
 # Linker flags
 
 # statically link libstdc++.so, work with gcc but ignored by g++
-STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+ifeq ($(OS_VENDOR), Darwin)
+  ifeq ($(USE_CLANG), true)
+    STATIC_STDCXX = -Wl,-Bstatic -lc++ -Wl,-Bdynamic
+  else
+    STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+  endif
+else
+  STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+endif
 
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/jsig.make	2021-08-09 15:12:52.000000000 +0000
@@ -54,6 +54,11 @@
 
 LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
+ifeq ($(OS_VENDOR), Darwin)
+# bring in minimum version argument or we'll fail on OSX 10.10
+LFLAGS_JSIG += $(LFLAGS)
+endif
+
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
   JSIG_DEBUG_CFLAGS = -g
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/bsd/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/bsd/makefiles/saproc.make	2021-08-09 15:12:52.000000000 +0000
@@ -78,8 +78,10 @@
     ifneq ($(SDKPATH),)
       SA_SYSROOT_FLAGS += -isysroot "$(SDKPATH)" -iframework"$(SDKPATH)/System/Library/Frameworks"
     endif
-    # always needed, even if SDKPATH is empty
-    SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    ifneq ($(wildcard "$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"), "")
+      # always needed, even if SDKPATH is empty
+      SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    endif
   else
     SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
     SALIBS = 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/make/linux/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar2=/make/linux/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar2=/make/linux/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/make/linux/makefiles/gcc.make	2021-08-09 15:12:52.000000000 +0000
@@ -226,6 +226,18 @@
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 
+# On newer GCCs, the compiler complains about null being passed
+# to the %s format specifier. The warning appears only on 8u,
+# but the code is largely the same up to trunk. We disable
+# the warning until the code is fixed, to allow builds with
+# -Werror (the default).
+# See JDK-8269388 and PR3798 in IcedTea:
+# https://icedtea.wildebeest.org/hg/icedtea8-forest/hotspot/rev/9f2ceb42dc64
+# Option only exists on GCC 7 and later, checked by configure
+ifeq ($(USE_FORMAT_OVERFLOW), 1)
+  CFLAGS_WARN/os_linux.o = $(CFLAGS_WARN/DEFAULT) -Wno-error=format-overflow
+endif
+
 # The flags to use for an Optimized g++ build
 OPT_CFLAGS/SIZE=-Os
 OPT_CFLAGS/SPEED=-O3
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/aarch64.ad openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/aarch64.ad
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/aarch64.ad	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/aarch64.ad	2021-08-09 15:12:52.000000000 +0000
@@ -926,6 +926,8 @@
 
 source_hpp %{
 
+#include "opto/addnode.hpp"
+
 class CallStubImpl {
  
   //--------------------------------------------------------------
@@ -980,6 +982,9 @@
 
   // predicate controlling translation of StoreCM
   bool unnecessary_storestore(const Node *storecm);
+
+  // predicate controlling addressing modes
+  bool size_fits_all_mem_uses(AddPNode* addp, int shift);
 %}
 
 source %{
@@ -2159,6 +2164,26 @@
   return FP_REG_mask();
 }
 
+bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
+  for (DUIterator_Fast imax, i = addp->fast_outs(imax); i < imax; i++) {
+    Node* u = addp->fast_out(i);
+    if (u->is_LoadStore()) {
+      // On AArch64, LoadStoreNodes (i.e. compare and swap
+      // instructions) only take register indirect as an operand, so
+      // any attempt to use an AddPNode as an input to a LoadStoreNode
+      // must fail.
+      return false;
+    }
+    if (u->is_Mem()) {
+      int opsize = u->as_Mem()->memory_size();
+      assert(opsize > 0, "unexpected memory operand size");
+      if (u->as_Mem()->memory_size() != (1<<shift)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
 
 #define MOV_VOLATILE(REG, BASE, INDEX, SCALE, DISP, SCRATCH, INSN)	\
   MacroAssembler _masm(&cbuf);						\
@@ -4755,6 +4780,8 @@
 
 operand indIndexScaledOffsetI(iRegP reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4769,6 +4796,8 @@
 
 operand indIndexScaledOffsetL(iRegP reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4797,6 +4826,8 @@
 
 operand indIndexScaledOffsetI2L(iRegP reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -4811,6 +4842,8 @@
 
 operand indIndexScaledI2L(iRegP reg, iRegI ireg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -4825,6 +4858,8 @@
 
 operand indIndexScaled(iRegP reg, iRegL lreg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL lreg scale));
   op_cost(0);
@@ -4980,7 +5015,9 @@
 
 operand indIndexScaledOffsetIN(iRegN reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(0);
@@ -4995,7 +5032,9 @@
 
 operand indIndexScaledOffsetLN(iRegN reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -5025,7 +5064,9 @@
 
 operand indIndexScaledOffsetI2LN(iRegN reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -5040,7 +5081,9 @@
 
 operand indIndexScaledI2LN(iRegN reg, iRegI ireg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -5055,7 +5098,9 @@
 
 operand indIndexScaledN(iRegN reg, iRegL lreg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL lreg scale));
   op_cost(0);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/assembler_aarch64.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/assembler_aarch64.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -1288,7 +1288,7 @@
 
   INSN(ldrs, 0b00, 1);
   INSN(ldrd, 0b01, 1);
-  INSN(ldrq, 0x10, 1);
+  INSN(ldrq, 0b10, 1);
 
 #undef INSN
 
@@ -1975,7 +1975,7 @@
  public:
 
   enum SIMD_Arrangement {
-       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D
+       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D, T1Q
   };
 
   enum SIMD_RegVariant {
@@ -2306,14 +2306,16 @@
     f(0b001111, 15, 10), rf(Vn, 5), rf(Xd, 0);
   }
 
-  // We do not handle the 1Q arrangement.
   void pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
     starti;
-    assert(Ta == T8H && (Tb == T8B || Tb == T16B), "Invalid Size specifier");
-    f(0, 31), f(Tb & 1, 30), f(0b001110001, 29, 21), rf(Vm, 16), f(0b111000, 15, 10);
-    rf(Vn, 5), rf(Vd, 0);
+    assert((Ta == T1Q && (Tb == T1D || Tb == T2D)) ||
+           (Ta == T8H && (Tb == T8B || Tb == T16B)), "Invalid Size specifier");
+    int size = (Ta == T1Q) ? 0b11 : 0b00;
+    f(0, 31), f(Tb & 1, 30), f(0b001110, 29, 24), f(size, 23, 22);
+    f(1, 21), rf(Vm, 16), f(0b111000, 15, 10), rf(Vn, 5), rf(Vd, 0);
   }
   void pmull2(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
+    assert(Tb == T2D || Tb == T16B, "pmull2 assumes T2D or T16B as the second size specifier");
     pmull(Vd, Ta, Vn, Vm, Tb);
   }
 
@@ -2326,15 +2328,6 @@
     f(0b100001010010, 21, 10), rf(Vn, 5), rf(Vd, 0);
   }
 
-  void rev32(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn)
-  {
-    starti;
-    assert(T <= T8H, "must be one of T8B, T16B, T4H, T8H");
-    f(0, 31), f((int)T & 1, 30), f(0b101110, 29, 24);
-    f(T <= T16B ? 0b00 : 0b01, 23, 22), f(0b100000000010, 21, 10);
-    rf(Vn, 5), rf(Vd, 0);
-  }
-
   void dup(FloatRegister Vd, SIMD_Arrangement T, Register Xs)
   {
     starti;
@@ -2367,6 +2360,68 @@
 
 #undef INSN
 
+   // Table vector lookup
+#define INSN(NAME, op)                                                  \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, unsigned registers, FloatRegister Vm) { \
+    starti;                                                             \
+    assert(T == T8B || T == T16B, "invalid arrangement");               \
+    assert(0 < registers && registers <= 4, "invalid number of registers"); \
+    f(0, 31), f((int)T & 1, 30), f(0b001110000, 29, 21), rf(Vm, 16), f(0, 15); \
+    f(registers - 1, 14, 13), f(op, 12),f(0b00, 11, 10), rf(Vn, 5), rf(Vd, 0); \
+  }
+
+  INSN(tbl, 0);
+  INSN(tbx, 1);
+
+#undef INSN
+
+  // AdvSIMD two-reg misc
+#define INSN(NAME, U, opcode)                                                       \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {               \
+       starti;                                                                      \
+       assert((ASSERTION), MSG);                                                    \
+       f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24);                   \
+       f((int)(T >> 1), 23, 22), f(0b10000, 21, 17), f(opcode, 16, 12);             \
+       f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0);                                       \
+ }
+
+#define MSG "invalid arrangement"
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H || T == T2S || T == T4S)
+  INSN(rev64, 0, 0b00000);
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H)
+  INSN(rev32, 1, 0b00000);
+private:
+  INSN(_rbit, 1, 0b00101);
+public:
+
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B)
+  INSN(rev16, 0, 0b00001);
+  // RBIT only allows T8B and T16B but encodes them oddly.  Argh...
+  void rbit(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {
+    assert((ASSERTION), MSG);
+    _rbit(Vd, SIMD_Arrangement(T & 1 | 0b010), Vn);
+  }
+#undef ASSERTION
+
+#undef MSG
+
+#undef INSN
+
+ void ext(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm, int index)
+   {
+     starti;
+     assert(T == T8B || T == T16B, "invalid arrangement");
+     assert((T == T8B && index <= 0b0111) || (T == T16B && index <= 0b1111), "Invalid index value");
+     f(0, 31), f((int)T & 1, 30), f(0b101110000, 29, 21);
+     rf(Vm, 16), f(0, 15), f(index, 14, 11);
+     f(0, 10), rf(Vn, 5), rf(Vd, 0);
+   }
+
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
   }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -603,12 +603,12 @@
   } else {
     assert (x->op() == Bytecodes::_imul, "expect imul");
     if (right.is_constant()) {
-      int c = right.get_jint_constant();
-      if (! is_power_of_2(c) && ! is_power_of_2(c + 1) && ! is_power_of_2(c - 1)) {
-        // Cannot use constant op.
-        right.load_item();
+      jint c = right.get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+        right_arg->dont_load_item();
       } else {
-        right.dont_load_item();
+        // Cannot use constant op.
+        right_arg->load_item();
       }
     } else {
       right.load_item();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -143,9 +143,9 @@
 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
-    stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
+    stp(arg3, arg2, Address(pre(sp, -2 * wordSize)));
     stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
     ldp(c_rarg1, zr, Address(post(sp, 2 * wordSize)));
     ldp(c_rarg3, c_rarg2, Address(post(sp, 2 * wordSize)));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -644,6 +644,11 @@
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
 
+  // lr could be poisoned with PAC signature during throw_pending_exception
+  // if it was tail-call optimized by compiler, since lr is not callee-saved
+  // reload it with proper value
+  adr(lr, l);
+
   // reset last Java frame
   // Only interpreter should have to clear fp
   reset_last_Java_frame(true);
@@ -1262,7 +1267,7 @@
   stp(rscratch2, lr, Address(pre(sp, -2 * wordSize)));
 
   mov(r0, reg);
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -1298,7 +1303,7 @@
   } else {
     ldr(r0, addr);
   }
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -1993,8 +1998,8 @@
 void MacroAssembler::stop(const char* msg) {
   address ip = pc();
   pusha();
-  mov(c_rarg0, (address)msg);
-  mov(c_rarg1, (address)ip);
+  movptr(c_rarg0, (uintptr_t)(address)msg);
+  movptr(c_rarg1, (uintptr_t)(address)ip);
   mov(c_rarg2, sp);
   mov(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
   blr(c_rarg3);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013, Red Hat Inc.
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates.
  * All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1367,10 +1367,10 @@
       __ ldr(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ verify_oop(temp);
     } else {
-      __ ldrw(r16, Address(a, rscratch2, Address::lsl(exact_log2(size))));
+      __ ldrw(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ decode_heap_oop(temp); // calls verify_oop
     }
-    __ add(rscratch2, rscratch2, size);
+    __ add(rscratch2, rscratch2, 1);
     __ b(loop);
     __ bind(end);
   }
@@ -3204,6 +3204,69 @@
     return start;
   }
 
+  void ghash_multiply(FloatRegister result_lo, FloatRegister result_hi,
+                      FloatRegister a, FloatRegister b, FloatRegister a1_xor_a0,
+                      FloatRegister tmp1, FloatRegister tmp2, FloatRegister tmp3, FloatRegister tmp4) {
+    // Karatsuba multiplication performs a 128*128 -> 256-bit
+    // multiplication in three 128-bit multiplications and a few
+    // additions.
+    //
+    // (C1:C0) = A1*B1, (D1:D0) = A0*B0, (E1:E0) = (A0+A1)(B0+B1)
+    // (A1:A0)(B1:B0) = C1:(C0+C1+D1+E1):(D1+C0+D0+E0):D0
+    //
+    // Inputs:
+    //
+    // A0 in a.d[0]     (subkey)
+    // A1 in a.d[1]
+    // (A1+A0) in a1_xor_a0.d[0]
+    //
+    // B0 in b.d[0]     (state)
+    // B1 in b.d[1]
+
+    __ ext(tmp1, __ T16B, b, b, 0x08);
+    __ pmull2(result_hi, __ T1Q, b, a, __ T2D);  // A1*B1
+    __ eor(tmp1, __ T16B, tmp1, b);            // (B1+B0)
+    __ pmull(result_lo,  __ T1Q, b, a, __ T1D);  // A0*B0
+    __ pmull(tmp2, __ T1Q, tmp1, a1_xor_a0, __ T1D); // (A1+A0)(B1+B0)
+
+    __ ext(tmp4, __ T16B, result_lo, result_hi, 0x08);
+    __ eor(tmp3, __ T16B, result_hi, result_lo); // A1*B1+A0*B0
+    __ eor(tmp2, __ T16B, tmp2, tmp4);
+    __ eor(tmp2, __ T16B, tmp2, tmp3);
+
+    // Register pair <result_hi:result_lo> holds the result of carry-less multiplication
+    __ ins(result_hi, __ D, tmp2, 0, 1);
+    __ ins(result_lo, __ D, tmp2, 1, 0);
+  }
+
+  void ghash_reduce(FloatRegister result, FloatRegister lo, FloatRegister hi,
+                    FloatRegister p, FloatRegister z, FloatRegister t1) {
+    const FloatRegister t0 = result;
+
+    // The GCM field polynomial f is z^128 + p(z), where p =
+    // z^7+z^2+z+1.
+    //
+    //    z^128 === -p(z)  (mod (z^128 + p(z)))
+    //
+    // so, given that the product we're reducing is
+    //    a == lo + hi * z^128
+    // substituting,
+    //      === lo - hi * p(z)  (mod (z^128 + p(z)))
+    //
+    // we reduce by multiplying hi by p(z) and subtracting the result
+    // from (i.e. XORing it with) lo.  Because p has no nonzero high
+    // bits we can do this with two 64-bit multiplications, lo*p and
+    // hi*p.
+
+    __ pmull2(t0, __ T1Q, hi, p, __ T2D);
+    __ ext(t1, __ T16B, t0, z, 8);
+    __ eor(hi, __ T16B, hi, t1);
+    __ ext(t1, __ T16B, z, t0, 8);
+    __ eor(lo, __ T16B, lo, t1);
+    __ pmull(t0, __ T1Q, hi, p, __ T1D);
+    __ eor(result, __ T16B, lo, t0);
+  }
+
   /**
    *  Arguments:
    *
@@ -3244,6 +3307,93 @@
     return start;
   }
 
+  /**
+   *  Arguments:
+   *
+   *  Input:
+   *  c_rarg0   - current state address
+   *  c_rarg1   - H key address
+   *  c_rarg2   - data address
+   *  c_rarg3   - number of blocks
+   *
+   *  Output:
+   *  Updated state at c_rarg0
+   */
+  address generate_ghash_processBlocks() {
+    // Bafflingly, GCM uses little-endian for the byte order, but
+    // big-endian for the bit order.  For example, the polynomial 1 is
+    // represented as the 16-byte string 80 00 00 00 | 12 bytes of 00.
+    //
+    // So, we must either reverse the bytes in each word and do
+    // everything big-endian or reverse the bits in each byte and do
+    // it little-endian.  On AArch64 it's more idiomatic to reverse
+    // the bits in each byte (we have an instruction, RBIT, to do
+    // that) and keep the data in little-endian bit order throught the
+    // calculation, bit-reversing the inputs and outputs.
+
+    StubCodeMark mark(this, "StubRoutines", "ghash_processBlocks");
+    __ align(wordSize * 2);
+    address p = __ pc();
+    __ emit_int64(0x87);  // The low-order bits of the field
+                          // polynomial (i.e. p = z^7+z^2+z+1)
+                          // repeated in the low and high parts of a
+                          // 128-bit vector
+    __ emit_int64(0x87);
+
+    __ align(CodeEntryAlignment);
+    address start = __ pc();
+
+    Register state   = c_rarg0;
+    Register subkeyH = c_rarg1;
+    Register data    = c_rarg2;
+    Register blocks  = c_rarg3;
+
+    FloatRegister vzr = v30;
+    __ eor(vzr, __ T16B, vzr, vzr); // zero register
+
+    __ ldrq(v0, Address(state));
+    __ ldrq(v1, Address(subkeyH));
+
+    __ rev64(v0, __ T16B, v0);          // Bit-reverse words in state and subkeyH
+    __ rbit(v0, __ T16B, v0);
+    __ rev64(v1, __ T16B, v1);
+    __ rbit(v1, __ T16B, v1);
+
+    __ ldrq(v26, p);
+
+    __ ext(v16, __ T16B, v1, v1, 0x08); // long-swap subkeyH into v1
+    __ eor(v16, __ T16B, v16, v1);      // xor subkeyH into subkeyL (Karatsuba: (A1+A0))
+
+    {
+      Label L_ghash_loop;
+      __ bind(L_ghash_loop);
+
+      __ ldrq(v2, Address(__ post(data, 0x10))); // Load the data, bit
+                                                 // reversing each byte
+      __ rbit(v2, __ T16B, v2);
+      __ eor(v2, __ T16B, v0, v2);   // bit-swapped data ^ bit-swapped state
+
+      // Multiply state in v2 by subkey in v1
+      ghash_multiply(/*result_lo*/v5, /*result_hi*/v7,
+                     /*a*/v1, /*b*/v2, /*a1_xor_a0*/v16,
+                     /*temps*/v6, v20, v18, v21);
+      // Reduce v7:v5 by the field polynomial
+      ghash_reduce(v0, v5, v7, v26, vzr, v20);
+
+      __ sub(blocks, blocks, 1);
+      __ cbnz(blocks, L_ghash_loop);
+    }
+
+    // The bit-reversed result is at this point in v0
+    __ rev64(v1, __ T16B, v0);
+    __ rbit(v1, __ T16B, v1);
+
+    __ st1(v1, __ T16B, state);
+    __ ret(lr);
+
+    return start;
+  }
+
   // Continuation point for throwing of implicit exceptions that are
   // not handled in the current activation. Fabricates an exception
   // oop and initiates normal exception dispatching in this
@@ -4253,6 +4403,11 @@
       StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt();
     }
 
+    // generate GHASH intrinsics code
+    if (UseGHASHIntrinsics) {
+      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
+    }
+
     if (UseSHA1Intrinsics) {
       StubRoutines::_sha1_implCompress     = generate_sha1_implCompress(false,   "sha1_implCompress");
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true,    "sha1_implCompressMB");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/vm_version_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/vm_version_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -41,6 +41,10 @@
 #define HWCAP_AES   (1<<3)
 #endif
 
+#ifndef HWCAP_PMULL
+#define HWCAP_PMULL (1<<4)
+#endif
+
 #ifndef HWCAP_SHA1
 #define HWCAP_SHA1  (1<<5)
 #endif
@@ -138,6 +142,17 @@
     if (PrefetchCopyIntervalInBytes >= 32768)
       PrefetchCopyIntervalInBytes = 32760;
   }
+
+  if (AllocatePrefetchDistance !=-1 && (AllocatePrefetchDistance & 7)) {
+    warning("AllocatePrefetchDistance must be multiple of 8");
+    AllocatePrefetchDistance &= ~7;
+  }
+
+  if (AllocatePrefetchStepSize & 7) {
+    warning("AllocatePrefetchStepSize must be multiple of 8");
+    AllocatePrefetchStepSize &= ~7;
+  }
+
   FLAG_SET_DEFAULT(UseSSE42Intrinsics, true);
 
   unsigned long auxv = getauxval(AT_HWCAP);
@@ -226,7 +241,11 @@
     }
   }
 
-  if (UseGHASHIntrinsics) {
+  if (auxv & HWCAP_PMULL) {
+    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, true);
+    }
+  } else if (UseGHASHIntrinsics) {
     warning("GHASH intrinsics are not available on this CPU");
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/ppc/vm/frame_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/ppc/vm/frame_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/ppc/vm/frame_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/ppc/vm/frame_ppc.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -67,8 +67,8 @@
     return false;
   }
 
-  // Unextended sp must be within the stack and above or equal sp
-  bool unextended_sp_safe = (unextended_sp < thread->stack_base()) && (unextended_sp >= sp);
+  // Unextended sp must be within the stack
+  bool unextended_sp_safe = (unextended_sp < thread->stack_base());
 
   if (!unextended_sp_safe) {
     return false;
@@ -76,9 +76,10 @@
 
   // An fp must be within the stack and above (but not equal) sp.
   bool fp_safe = (fp <= thread->stack_base()) &&  (fp > sp);
-  // an interpreter fp must be within the stack and above (but not equal) sp
-  bool fp_interp_safe = (fp <= thread->stack_base()) &&  (fp > sp) &&
-    ((fp - sp) >= (ijava_state_size + top_ijava_frame_abi_size));
+  // An interpreter fp must be within the stack and above (but not equal) sp.
+  // Moreover, it must be at least the size of the ijava_state structure.
+  bool fp_interp_safe = (fp <= thread->stack_base()) && (fp > sp) &&
+    ((fp - sp) >= ijava_state_size);
 
   // We know sp/unextended_sp are safe, only fp is questionable here
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/sparc/vm/assembler_sparc.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/sparc/vm/assembler_sparc.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -363,6 +363,13 @@
     return is_in_wdisp_range(a, b, 30);
   }
 
+  static bool is_simm5(intptr_t x) { return is_simm(x, 5); }
+  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
+  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
+  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
+
+  static int min_simm13() { return -4096; }
+
   enum ASIs { // page 72, v9
     ASI_PRIMARY            = 0x80,
     ASI_PRIMARY_NOFAULT    = 0x82,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/x86/vm/c1_Runtime1_x86.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/x86/vm/c1_Runtime1_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -172,8 +172,8 @@
 #ifdef _LP64
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
     push(arg3);
     push(arg2);
     push(arg1);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/x86/vm/templateTable_x86_64.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/x86/vm/templateTable_x86_64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -107,10 +107,6 @@
   return Address(rsp,  Interpreter::expr_offset_in_bytes(2));
 }
 
-static inline Address at_tos_p3() {
-  return Address(rsp,  Interpreter::expr_offset_in_bytes(3));
-}
-
 // Condition conversion
 static Assembler::Condition j_not(TemplateTable::Condition cc) {
   switch (cc) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os/aix/vm/decoder_aix.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os/aix/vm/decoder_aix.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os/aix/vm/decoder_aix.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os/aix/vm/decoder_aix.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -32,7 +32,7 @@
   AIXDecoder() {
     _decoder_status = no_error;
   }
-  ~AIXDecoder() {}
+  virtual ~AIXDecoder() {}
 
   virtual bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os/bsd/vm/decoder_machO.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os/bsd/vm/decoder_machO.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os/bsd/vm/decoder_machO.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os/bsd/vm/decoder_machO.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -34,7 +34,7 @@
 class MachODecoder : public AbstractDecoder {
  public:
   MachODecoder() { }
-  ~MachODecoder() { }
+  virtual ~MachODecoder() { }
   virtual bool can_decode_C_frame_in_vm() const {
     return true;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os/windows/vm/decoder_windows.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os/windows/vm/decoder_windows.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os/windows/vm/decoder_windows.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os/windows/vm/decoder_windows.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -56,7 +56,7 @@
 
 public:
   WindowsDecoder();
-  ~WindowsDecoder() { uninitialize(); };
+  virtual ~WindowsDecoder() { uninitialize(); };
 
   bool can_decode_C_frame_in_vm() const;
   bool demangle(const char* symbol, char *buf, int buflen);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -178,7 +178,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Aix::chained_handler(sig, info, ucVoid)) {
       return 1;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -846,7 +846,7 @@
   *size = pthread_get_stacksize_np(self);
   // workaround for OS X 10.9.0 (Mavericks)
   // pthread_get_stacksize_np returns 128 pages even though the actual size is 2048 pages
-  if (pthread_main_np() == 1) {
+  if (::pthread_main_np() == 1) {
     if ((*size) < (DEFAULT_MAIN_THREAD_STACK_PAGES * (size_t)getpagesize())) {
       char kern_osrelease[256];
       size_t kern_osrelease_size = sizeof(kern_osrelease);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -185,7 +185,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Linux::chained_handler(sig, info, ucVoid)) {
       return true;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -51,21 +51,22 @@
     }
 
     if (ret_frame.is_interpreted_frame()) {
-       frame::ijava_state* istate = ret_frame.get_ijava_state();
-       if (!((Method*)(istate->method))->is_metaspace_object()) {
-         return false;
-       }
-       uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
-       uint64_t istate_bcp = istate->bcp;
-       uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
-       uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
-       if (istate_bcp >= code_start && istate_bcp < code_end) {
-         // we have a valid bcp, don't touch it, do nothing
-       } else if (reg_bcp >= code_start && reg_bcp < code_end) {
-         istate->bcp = reg_bcp;
+      frame::ijava_state *istate = ret_frame.get_ijava_state();
+      const Method *m = (const Method*)(istate->method);
+      if (m == NULL || !m->is_valid_method()) return false;
+      if (!Metaspace::contains((const void*)m)) return false;
+
+      uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
+      uint64_t istate_bcp = istate->bcp;
+      uint64_t code_start = (uint64_t)(m->code_base());
+      uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
+      if (istate_bcp >= code_start && istate_bcp < code_end) {
+        // we have a valid bcp, don't touch it, do nothing
+      } else if (reg_bcp >= code_start && reg_bcp < code_end) {
+        istate->bcp = reg_bcp;
       } else {
-         return false;
-       }
+        return false;
+      }
     }
     if (!ret_frame.safe_for_sender(this)) {
       // nothing else to try if the frame isn't good
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/tools/hsdis/hsdis.c openjdk-8-8u312-b07/=unpacked-tar2=/src/share/tools/hsdis/hsdis.c
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/tools/hsdis/hsdis.c	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/tools/hsdis/hsdis.c	2021-08-09 15:12:52.000000000 +0000
@@ -150,15 +150,15 @@
                     event_callback_t  event_callback_arg,  void* event_stream_arg,
                     printf_callback_t printf_callback_arg, void* printf_stream_arg,
                     const char* options) {
-  decode_instructions_virtual((uintptr_t)start_pv,
-                             (uintptr_t)end_pv,
-                             (unsigned char*)start_pv,
-                             (uintptr_t)end_pv - (uintptr_t)start_pv,
-                             event_callback_arg,
-                             event_stream_arg,
-                             printf_callback_arg,
-                             printf_stream_arg,
-                             options, false);
+  return decode_instructions_virtual((uintptr_t)start_pv,
+                                     (uintptr_t)end_pv,
+                                     (unsigned char*)start_pv,
+                                     (uintptr_t)end_pv - (uintptr_t)start_pv,
+                                     event_callback_arg,
+                                     event_stream_arg,
+                                     printf_callback_arg,
+                                     printf_stream_arg,
+                                     options, false);
 }
 
 static void* decode(struct hsdis_app_data* app_data, const char* options) {
@@ -237,6 +237,7 @@
   case dis_condjsr:     type = "condjsr";    break;
   case dis_dref:        type = "dref";       break;
   case dis_dref2:       type = "dref2";      break;
+  case dis_noninsn:     type = "noninsn";    break;
   }
 
   strcpy(buf, close);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/adlc/formssel.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/adlc/formssel.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/adlc/formssel.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/adlc/formssel.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -3396,7 +3396,7 @@
 // Count occurrences of operands names in the leaves of the instruction
 // match rule.
 void MatchNode::count_instr_names( Dict &names ) {
-  if( !this ) return;
+  if( this == NULL ) return;
   if( _lChild ) _lChild->count_instr_names(names);
   if( _rChild ) _rChild->count_instr_names(names);
   if( !_lChild && !_rChild ) {
@@ -3969,40 +3969,13 @@
 }
 
 int MatchRule::is_ideal_copy() const {
-  if( _rChild ) {
-    const char  *opType = _rChild->_opType;
-#if 1
-    if( strcmp(opType,"CastIP")==0 )
-      return 1;
-#else
-    if( strcmp(opType,"CastII")==0 )
-      return 1;
-    // Do not treat *CastPP this way, because it
-    // may transfer a raw pointer to an oop.
-    // If the register allocator were to coalesce this
-    // into a single LRG, the GC maps would be incorrect.
-    //if( strcmp(opType,"CastPP")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CheckCastPP")==0 )
-    //  return 1;
-    //
-    // Do not treat CastX2P or CastP2X this way, because
-    // raw pointers and int types are treated differently
-    // when saving local & stack info for safepoints in
-    // Output().
-    //if( strcmp(opType,"CastX2P")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CastP2X")==0 )
-    //  return 1;
-#endif
-  }
-  if( is_chain_rule(_AD.globalNames()) &&
-      _lChild && strncmp(_lChild->_opType,"stackSlot",9)==0 )
+  if (is_chain_rule(_AD.globalNames()) &&
+      _lChild && strncmp(_lChild->_opType, "stackSlot", 9) == 0) {
     return 1;
+  }
   return 0;
 }
 
-
 int MatchRule::is_expensive() const {
   if( _rChild ) {
     const char  *opType = _rChild->_opType;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/adlc/output_h.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/adlc/output_h.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/adlc/output_h.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/adlc/output_h.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2162,7 +2162,9 @@
 public:
   OutputMachOpcodes(FILE *hpp, FILE *cpp, FormDict &globals, ArchDesc &AD)
     : OutputMap(hpp, cpp, globals, AD, "MachOpcodes"),
-      begin_inst_chain_rule(-1), end_inst_chain_rule(-1), end_instructions(-1)
+      begin_inst_chain_rule(-1), end_inst_chain_rule(-1),
+      begin_rematerialize(-1), end_rematerialize(-1),
+      end_instructions(-1)
   {};
 
   void declaration() { }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/asm/assembler.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/asm/assembler.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/asm/assembler.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/asm/assembler.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -294,28 +294,29 @@
   void emit_double( jdouble x) { code_section()->emit_double( x); }
   void emit_address(address x) { code_section()->emit_address(x); }
 
-  // min and max values for signed immediate ranges
-  static int min_simm(int nbits) { return -(intptr_t(1) << (nbits - 1))    ; }
-  static int max_simm(int nbits) { return  (intptr_t(1) << (nbits - 1)) - 1; }
-
-  // Define some:
-  static int min_simm10() { return min_simm(10); }
-  static int min_simm13() { return min_simm(13); }
-  static int min_simm16() { return min_simm(16); }
-
-  // Test if x is within signed immediate range for nbits
-  static bool is_simm(intptr_t x, int nbits) { return min_simm(nbits) <= x && x <= max_simm(nbits); }
-
-  // Define some:
-  static bool is_simm5( intptr_t x) { return is_simm(x, 5 ); }
-  static bool is_simm8( intptr_t x) { return is_simm(x, 8 ); }
-  static bool is_simm10(intptr_t x) { return is_simm(x, 10); }
-  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
-  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
-  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
-  static bool is_simm16(intptr_t x) { return is_simm(x, 16); }
-  static bool is_simm26(intptr_t x) { return is_simm(x, 26); }
-  static bool is_simm32(intptr_t x) { return is_simm(x, 32); }
+  enum { min_simm10 = -512 };
+
+  // Test if x is within signed immediate range for width.
+  static bool is_simm(int64_t x, uint w) {
+    precond(1 < w && w < 64);
+    int64_t limes = INT64_C(1) << (w - 1);
+    return -limes <= x && x < limes;
+  }
+
+  static bool is_simm8(int64_t x) { return is_simm(x, 8); }
+  static bool is_simm9(int64_t x) { return is_simm(x, 9); }
+  static bool is_simm10(int64_t x) { return is_simm(x, 10); }
+  static bool is_simm16(int64_t x) { return is_simm(x, 16); }
+  static bool is_simm32(int64_t x) { return is_simm(x, 32); }
+
+  // Test if x is within unsigned immediate range for width.
+  static bool is_uimm(uint64_t x, uint w) {
+    precond(0 < w && w < 64);
+    uint64_t limes = UINT64_C(1) << w;
+    return x < limes;
+  }
+
+  static bool is_uimm12(uint64_t x) { return is_uimm(x, 12); }
 
   // Accessors
   CodeSection*  code_section() const   { return _code_section; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_Instruction.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_Instruction.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_Instruction.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_Instruction.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -2124,11 +2124,11 @@
   // creation
   TableSwitch(Value tag, BlockList* sux, int lo_key, ValueStack* state_before, bool is_safepoint)
     : Switch(tag, sux, state_before, is_safepoint)
-  , _lo_key(lo_key) {}
+  , _lo_key(lo_key) { assert(_lo_key <= hi_key(), "integer overflow"); }
 
   // accessors
   int lo_key() const                             { return _lo_key; }
-  int hi_key() const                             { return _lo_key + length() - 1; }
+  int hi_key() const                             { return _lo_key + (length() - 1); }
 };
 
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_IR.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_IR.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_IR.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_IR.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -578,11 +578,8 @@
     assert(is_visited(cur), "block must be visisted when block is active");
     assert(parent != NULL, "must have parent");
 
-    cur->set(BlockBegin::linear_scan_loop_header_flag);
     cur->set(BlockBegin::backward_branch_target_flag);
 
-    parent->set(BlockBegin::linear_scan_loop_end_flag);
-
     // When a loop header is also the start of an exception handler, then the backward branch is
     // an exception edge. Because such edges are usually critical edges which cannot be split, the
     // loop must be excluded here from processing.
@@ -591,6 +588,10 @@
       _iterative_dominators = true;
       return;
     }
+
+    cur->set(BlockBegin::linear_scan_loop_header_flag);
+    parent->set(BlockBegin::linear_scan_loop_end_flag);
+
     assert(parent->number_of_sux() == 1 && parent->sux_at(0) == cur,
            "loop end blocks must have one successor (critical edges are split)");
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_LIRGenerator.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_LIRGenerator.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2520,8 +2520,8 @@
   move_to_phi(x->state());
 
   int lo_key = x->lo_key();
-  int hi_key = x->hi_key();
   int len = x->length();
+  assert(lo_key <= (lo_key + (len - 1)), "integer overflow");
   LIR_Opr value = tag.result();
   if (UseTableRanges) {
     do_SwitchRanges(create_lookup_ranges(x), value, x->default_sux());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_RangeCheckElimination.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_RangeCheckElimination.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -971,7 +971,7 @@
           } else {
             // Has no upper bound
             Instruction *instr = ai->length();
-            if (instr != NULL) instr = ai->array();
+            if (instr == NULL) instr = ai->array();
             update_bound(pushed, ai->index(), Instruction::lss, instr, 0);
           }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_Runtime1.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_Runtime1.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_Runtime1.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_Runtime1.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -983,6 +983,7 @@
         address copy_buff = stub_location - *byte_skip - *byte_count;
         address being_initialized_entry = stub_location - *being_initialized_entry_offset;
         if (TracePatching) {
+          ttyLocker ttyl;
           tty->print_cr(" Patching %s at bci %d at address " INTPTR_FORMAT "  (%s)", Bytecodes::name(code), bci,
                         p2i(instr_pc), (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
           nmethod* caller_code = CodeCache::find_nmethod(caller_frame.pc());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_ValueMap.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_ValueMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/c1/c1_ValueMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/c1/c1_ValueMap.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -328,7 +328,7 @@
 };
 
 LoopInvariantCodeMotion::LoopInvariantCodeMotion(ShortLoopOptimizer *slo, GlobalValueNumbering* gvn, BlockBegin* loop_header, BlockList* loop_blocks)
-  : _gvn(gvn), _short_loop_optimizer(slo) {
+  : _gvn(gvn), _short_loop_optimizer(slo), _insertion_point(NULL), _state(NULL), _insert_is_pred(false) {
 
   TRACE_VALUE_NUMBERING(tty->print_cr("using loop invariant code motion loop_header = %d", loop_header->block_id()));
   TRACE_VALUE_NUMBERING(tty->print_cr("** loop invariant code motion for short loop B%d", loop_header->block_id()));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classFileParser.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classFileParser.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classFileParser.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classFileParser.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2801,8 +2801,7 @@
     // Inner class index
     u2 inner_class_info_index = cfs->get_u2_fast();
     check_property(
-      inner_class_info_index == 0 ||
-        valid_klass_reference_at(inner_class_info_index),
+      valid_klass_reference_at(inner_class_info_index),
       "inner_class_info_index %u has bad constant type in class file %s",
       inner_class_info_index, CHECK_0);
     // Outer class index
@@ -2812,6 +2811,13 @@
         valid_klass_reference_at(outer_class_info_index),
       "outer_class_info_index %u has bad constant type in class file %s",
       outer_class_info_index, CHECK_0);
+
+    if (outer_class_info_index != 0) {
+      const Symbol* const outer_class_name = cp->klass_name_at(outer_class_info_index);
+      char* bytes = (char*)outer_class_name->bytes();
+      guarantee_property(bytes[0] != JVM_SIGNATURE_ARRAY,
+                         "Outer class is an array class in class file %s", CHECK_0);
+    }
     // Inner class name
     u2 inner_name_index = cfs->get_u2_fast();
     check_property(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classFileParser.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classFileParser.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classFileParser.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classFileParser.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -139,7 +139,7 @@
     u2 _contended_group;
 
     AnnotationCollector(Location location)
-    : _location(location), _annotations_present(0)
+    : _location(location), _annotations_present(0), _contended_group(0)
     {
       assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classLoader.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classLoader.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/classLoader.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/classLoader.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -39,7 +39,7 @@
   int    _num_meta_package_names;
  public:
   MetaIndex(char** meta_package_names, int num_meta_package_names);
-  ~MetaIndex();
+  virtual ~MetaIndex();
   bool may_contain(const char* class_name);
 };
 
@@ -61,6 +61,7 @@
   virtual bool is_lazy();
   // Constructor
   ClassPathEntry();
+  virtual ~ClassPathEntry() {}
   // Attempt to locate file_name through this class path entry.
   // Returns a class file parsing stream if successfull.
   virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
@@ -77,6 +78,7 @@
   bool is_jar_file()  { return false;  }
   const char* name()  { return _dir; }
   ClassPathDirEntry(const char* dir);
+  virtual ~ClassPathDirEntry() {}
   ClassFileStream* open_stream(const char* name, TRAPS);
   // Debugging
   NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
@@ -106,7 +108,7 @@
   bool is_jar_file()  { return true;  }
   const char* name()  { return _zip_name; }
   ClassPathZipEntry(jzfile* zip, const char* zip_name);
-  ~ClassPathZipEntry();
+  virtual ~ClassPathZipEntry();
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void contents_do(void f(const char* name, void* context), void* context);
@@ -134,6 +136,7 @@
   bool is_jar_file();
   const char* name()  { return _path; }
   LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception);
+  virtual ~LazyClassPathEntry() {}
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/javaClasses.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/javaClasses.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/javaClasses.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/javaClasses.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1443,9 +1443,9 @@
       method = mhandle();
     }
 
-    _methods->short_at_put(_index, method->orig_method_idnum());
+    _methods->ushort_at_put(_index, method->orig_method_idnum());
     _bcis->int_at_put(_index, merge_bci_and_version(bci, method->constants()->version()));
-    _cprefs->short_at_put(_index, method->name_index());
+    _cprefs->ushort_at_put(_index, method->name_index());
 
     // We need to save the mirrors in the backtrace to keep the class
     // from being unloaded while we still have this stack trace.
@@ -1562,10 +1562,10 @@
         Handle mirror(THREAD, mirrors->obj_at(index));
         // NULL mirror means end of stack trace
         if (mirror.is_null()) goto handle_cause;
-        int method = methods->short_at(index);
+        int method = methods->ushort_at(index);
         int version = version_at(bcis->int_at(index));
         int bci = bci_at(bcis->int_at(index));
-        int cpref = cprefs->short_at(index);
+        int cpref = cprefs->ushort_at(index);
         print_stack_element(st, mirror, method, version, bci, cpref);
       }
       result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
@@ -1858,10 +1858,10 @@
 
   assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check");
 
-  int method = methods->short_at(chunk_index);
+  int method = methods->ushort_at(chunk_index);
   int version = version_at(bcis->int_at(chunk_index));
   int bci = bci_at(bcis->int_at(chunk_index));
-  int cpref = cprefs->short_at(chunk_index);
+  int cpref = cprefs->ushort_at(chunk_index);
   Handle mirror(THREAD, mirrors->obj_at(chunk_index));
 
   // Chunk can be partial full
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/verifier.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/verifier.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/classfile/verifier.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/classfile/verifier.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2142,6 +2142,7 @@
   // Get field name and signature
   Symbol* field_name = cp->name_ref_at(index);
   Symbol* field_sig = cp->signature_ref_at(index);
+  bool is_getfield = false;
 
   if (!SignatureVerifier::is_valid_type_signature(field_sig)) {
     class_format_error(
@@ -2192,11 +2193,9 @@
       break;
     }
     case Bytecodes::_getfield: {
+      is_getfield = true;
       stack_object_type = current_frame->pop_stack(
         target_class_type, CHECK_VERIFY(this));
-      for (int i = 0; i < n; i++) {
-        current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
-      }
       goto check_protected;
     }
     case Bytecodes::_putfield: {
@@ -2226,6 +2225,15 @@
     check_protected: {
       if (_this_type == stack_object_type)
         break; // stack_object_type must be assignable to _current_class_type
+      if (was_recursively_verified()) {
+        if (is_getfield) {
+          // Push field type for getfield.
+          for (int i = 0; i < n; i++) {
+            current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+          }
+        }
+        return;
+      }
       Symbol* ref_class_name =
         cp->klass_name_at(cp->klass_ref_index_at(index));
       if (!name_in_supers(ref_class_name, current_class()))
@@ -2254,6 +2262,12 @@
     }
     default: ShouldNotReachHere();
   }
+  if (is_getfield) {
+    // Push field type for getfield after doing protection check.
+    for (int i = 0; i < n; i++) {
+      current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+    }
+  }
 }
 
 // Look at the method's handlers.  If the bci is in the handler's try block
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/codeBlob.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/codeBlob.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/codeBlob.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/codeBlob.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -198,6 +198,11 @@
   return oop_maps()->find_map_at_offset((intptr_t) return_address - (intptr_t) code_begin());
 }
 
+void CodeBlob::print_code() {
+  HandleMark hm;
+  ResourceMark m;
+  Disassembler::decode(this, tty);
+}
 
 //----------------------------------------------------------------------------------------------------
 // Implementation of BufferBlob
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/codeBlob.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/codeBlob.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/codeBlob.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/codeBlob.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -190,6 +190,7 @@
   void print() const                             { print_on(tty); }
   virtual void print_on(outputStream* st) const;
   virtual void print_value_on(outputStream* st) const;
+  void print_code();
 
   // Deal with Disassembler, VTune, Forte, JvmtiExport, MemoryService.
   static void trace_new_stub(CodeBlob* blob, const char* name1, const char* name2 = "");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/dependencies.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/dependencies.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/dependencies.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/dependencies.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -969,9 +969,9 @@
   // the spot-checking version:
   Klass* find_witness_in(KlassDepChange& changes,
                          Klass* context_type,
-                           bool participants_hide_witnesses);
-  bool witnessed_reabstraction_in_supers(Klass* k);
+                         bool participants_hide_witnesses);
  public:
+  bool witnessed_reabstraction_in_supers(Klass* k);
   Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) {
     assert(doing_subtype_search(), "must set up a subtype search");
     // When looking for unexpected concrete types,
@@ -1082,15 +1082,8 @@
     }
   }
 
-  if (is_witness(new_type)) {
-    if (!ignore_witness(new_type)) {
-      return new_type;
-    }
-  } else if (!doing_subtype_search()) {
-    // No witness found, but is_witness() doesn't detect method re-abstraction in case of spot-checking.
-    if (witnessed_reabstraction_in_supers(new_type)) {
-      return new_type;
-    }
+  if (is_witness(new_type) && !ignore_witness(new_type)) {
+    return new_type;
   }
 
   return NULL;
@@ -1475,16 +1468,109 @@
   return num;
 }
 
+
+// Try to determine whether root method in some context is concrete or not based on the information about the unique method
+// in that context. It exploits the fact that concrete root method is always inherited into the context when there's a unique method.
+// Hence, unique method holder is always a supertype of the context class when root method is concrete.
+// Examples for concrete_root_method
+//      C (C.m uniqm)
+//      |
+//      CX (ctxk) uniqm is inherited into context.
+//
+//      CX (ctxk) (CX.m uniqm) here uniqm is defined in ctxk.
+// Examples for !concrete_root_method
+//      CX (ctxk)
+//      |
+//      C (C.m uniqm) uniqm is in subtype of ctxk.
+bool Dependencies::is_concrete_root_method(Method* uniqm, Klass* ctxk) {
+  if (uniqm == NULL) {
+    return false; // match Dependencies::is_concrete_method() behavior
+  }
+  // Theoretically, the "direction" of subtype check matters here.
+  // On one hand, in case of interface context with a single implementor, uniqm can be in a superclass of the implementor which
+  // is not related to context class.
+  // On another hand, uniqm could come from an interface unrelated to the context class, but right now it is not possible:
+  // it is required that uniqm->method_holder() is the participant (uniqm->method_holder() <: ctxk), hence a default method
+  // can't be used as unique.
+  if (ctxk->is_interface()) {
+    Klass* implementor = InstanceKlass::cast(ctxk)->implementor();
+    assert(implementor != ctxk, "single implementor only"); // should have been invalidated earlier
+    ctxk = implementor;
+  }
+  InstanceKlass* holder = uniqm->method_holder();
+  assert(!holder->is_interface(), "no default methods allowed");
+  assert(ctxk->is_subclass_of(holder) || holder->is_subclass_of(ctxk), "not related");
+  return ctxk->is_subclass_of(holder);
+}
+
 // If a class (or interface) has a unique concrete method uniqm, return NULL.
 // Otherwise, return a class that contains an interfering method.
-Klass* Dependencies::check_unique_concrete_method(Klass* ctxk, Method* uniqm,
-                                                    KlassDepChange* changes) {
-  // Here is a missing optimization:  If uniqm->is_final(),
-  // we don't really need to search beneath it for overrides.
-  // This is probably not important, since we don't use dependencies
-  // to track final methods.  (They can't be "definalized".)
+Klass* Dependencies::check_unique_concrete_method(Klass* ctxk,
+                                                  Method* uniqm,
+                                                  KlassDepChange* changes) {
   ClassHierarchyWalker wf(uniqm->method_holder(), uniqm);
-  return wf.find_witness_definer(ctxk, changes);
+  Klass* witness = wf.find_witness_definer(ctxk, changes);
+  if (witness != NULL) {
+    return witness;
+  }
+  if (!Dependencies::is_concrete_root_method(uniqm, ctxk) || changes != NULL) {
+    Klass* conck = find_witness_AME(ctxk, uniqm, changes);
+    if (conck != NULL) {
+      // Found a concrete subtype 'conck' which does not override abstract root method.
+      return conck;
+    }
+  }
+  return NULL;
+}
+
+// Search for AME.
+// There are two version of checks.
+//   1) Spot checking version(Classload time). Newly added class is checked for AME.
+//      Checks whether abstract/overpass method is inherited into/declared in newly added concrete class.
+//   2) Compile time analysis for abstract/overpass(abstract klass) root_m. The non uniqm subtrees are checked for concrete classes.
+Klass* Dependencies::find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes) {
+  if (m != NULL) {
+    if (changes != NULL) {
+      // Spot checking version.
+      ClassHierarchyWalker wf(m);
+      Klass* new_type = changes->new_type();
+      if (wf.witnessed_reabstraction_in_supers(new_type)) {
+        return new_type;
+      }
+    } else {
+      // Note: It is required that uniqm->method_holder() is the participant (see ClassHierarchyWalker::found_method()).
+      ClassHierarchyWalker wf(m->method_holder());
+      Klass* conck = wf.find_witness_subtype(ctxk);
+      if (conck != NULL) {
+        Method* cm = InstanceKlass::cast(conck)->find_instance_method(m->name(), m->signature(), Klass::skip_private);
+        if (!Dependencies::is_concrete_method(cm, conck)) {
+          return conck;
+        }
+      }
+    }
+  }
+  return NULL;
+}
+
+// This function is used by find_unique_concrete_method(non vtable based)
+// to check whether subtype method overrides the base method.
+static bool overrides(Method* sub_m, Method* base_m) {
+  assert(base_m != NULL, "base method should be non null");
+  if (sub_m == NULL) {
+    return false;
+  }
+  /**
+   *  If base_m is public or protected then sub_m always overrides.
+   *  If base_m is !public, !protected and !private (i.e. base_m is package private)
+   *  then sub_m should be in the same package as that of base_m.
+   *  For package private base_m this is conservative approach as it allows only subset of all allowed cases in
+   *  the jvm specification.
+   **/
+  if (base_m->is_public() || base_m->is_protected() ||
+      base_m->method_holder()->is_same_class_package(sub_m->method_holder())) {
+    return true;
+  }
+  return false;
 }
 
 // Find the set of all non-abstract methods under ctxk that match m.
@@ -1507,7 +1593,14 @@
       // (This can happen if m is inherited into ctxk and fm overrides it.)
       return NULL;
     }
+  } else if (Dependencies::find_witness_AME(ctxk, fm) != NULL) {
+    // Found a concrete subtype which does not override abstract root method.
+    return NULL;
+  } else if (!overrides(fm, m)) {
+    // Found method doesn't override abstract root method.
+    return NULL;
   }
+  assert(Dependencies::is_concrete_root_method(fm, ctxk) == Dependencies::is_concrete_method(m, ctxk), "mismatch");
 #ifndef PRODUCT
   // Make sure the dependency mechanism will pass this discovery:
   if (VerifyDependencies && fm != NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/dependencies.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/dependencies.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/dependencies.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/dependencies.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -290,6 +290,9 @@
   static bool is_concrete_method(Method* m, Klass* k);  // m is invocable
   static Klass* find_finalizable_subclass(Klass* k);
 
+  static bool is_concrete_root_method(Method* uniqm, Klass* ctxk);
+  static Klass* find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes = NULL);
+
   // These versions of the concreteness queries work through the CI.
   // The CI versions are allowed to skew sometimes from the VM
   // (oop-based) versions.  The cost of such a difference is a
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/nmethod.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/nmethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/nmethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/nmethod.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2612,6 +2612,7 @@
     ResourceMark rm(thread);
     CodeBlob* cb = CodeCache::find_blob(pc);
     assert(cb != NULL && cb == this, "");
+    ttyLocker ttyl;
     tty->print_cr("implicit exception happened at " INTPTR_FORMAT, pc);
     print();
     method()->print_codes();
@@ -2933,13 +2934,6 @@
                                               nul_chk_table_size());
 }
 
-void nmethod::print_code() {
-  HandleMark hm;
-  ResourceMark m;
-  Disassembler::decode(this);
-}
-
-
 #ifndef PRODUCT
 
 void nmethod::print_scopes() {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/nmethod.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/nmethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/code/nmethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/code/nmethod.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -695,7 +695,6 @@
 
   // printing support
   void print()                          const;
-  void print_code();
   void print_relocations()                        PRODUCT_RETURN;
   void print_pcs()                                PRODUCT_RETURN;
   void print_scopes()                             PRODUCT_RETURN;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/compiler/disassembler.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/compiler/disassembler.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/compiler/disassembler.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/compiler/disassembler.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -89,7 +89,7 @@
   {
     // Match "jvm[^/]*" in jvm_path.
     const char* base = buf;
-    const char* p = strrchr(buf, '/');
+    const char* p = strrchr(buf, *os::file_separator());
     if (p != NULL) lib_offset = p - base + 1;
     p = strstr(p ? p : base, "jvm");
     if (p != NULL)  jvm_offset = p - base;
@@ -114,7 +114,7 @@
     if (_library == NULL) {
       // 3. <home>/jre/lib/<arch>/hsdis-<arch>.so
       buf[lib_offset - 1] = '\0';
-      const char* p = strrchr(buf, '/');
+      const char* p = strrchr(buf, *os::file_separator());
       if (p != NULL) {
         lib_offset = p - buf + 1;
         strcpy(&buf[lib_offset], hsdis_library_name);
@@ -504,6 +504,7 @@
 
 
 void Disassembler::decode(CodeBlob* cb, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(cb, st);
   env.output()->print_cr("Decoding CodeBlob " PTR_FORMAT, cb);
@@ -511,12 +512,14 @@
 }
 
 void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(CodeCache::find_blob_unsafe(start), st, c);
   env.decode_instructions(start, end);
 }
 
 void Disassembler::decode(nmethod* nm, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(nm, st);
   env.output()->print_cr("Decoding compiled method " PTR_FORMAT ":", nm);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#if !defined(__clang_major__) && defined(__GNUC__)
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "classfile/metadataOnStackMark.hpp"
 #include "code/codeCache.hpp"
@@ -232,7 +228,7 @@
     if (!curr->is_young()) {
       gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
                              "incorrectly tagged (y: %d, surv: %d)",
-                             curr->bottom(), curr->end(),
+                             p2i(curr->bottom()), p2i(curr->end()),
                              curr->is_young(), curr->is_survivor());
       ret = false;
     }
@@ -361,8 +357,8 @@
     while (curr != NULL) {
       gclog_or_tty->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d",
                              HR_FORMAT_PARAMS(curr),
-                             curr->prev_top_at_mark_start(),
-                             curr->next_top_at_mark_start(),
+                             p2i(curr->prev_top_at_mark_start()),
+                             p2i(curr->next_top_at_mark_start()),
                              curr->age_in_surv_rate_group_cond());
       curr = curr->get_next_young_region();
     }
@@ -487,7 +483,7 @@
   RedirtyLoggedCardTableEntryClosure redirty;
   dcqs.apply_closure_to_all_completed_buffers(&redirty);
   dcqs.iterate_closure_all_threads(&redirty, false);
-  gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
+  gclog_or_tty->print_cr("Log entries = " SIZE_FORMAT ", dirty cards = %d.",
                          clear.num_processed(), orig_count);
   guarantee(redirty.num_processed() == clear.num_processed(),
             err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
@@ -2690,8 +2686,8 @@
         gclog_or_tty->print_cr("Region " HR_FORMAT ", "
                                "HS = " PTR_FORMAT ", should be " PTR_FORMAT,
                                HR_FORMAT_PARAMS(r),
-                               r->humongous_start_region(),
-                               _sh_region);
+                               p2i(r->humongous_start_region()),
+                               p2i(_sh_region));
         ++_failures;
       }
     }
@@ -3002,9 +2998,9 @@
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       if (_g1h->is_obj_dead_cond(obj, _vo)) {
         gclog_or_tty->print_cr("Root location " PTR_FORMAT " "
-                              "points to dead obj " PTR_FORMAT, p, (void*) obj);
+                               "points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
         if (_vo == VerifyOption_G1UseMarkWord) {
-          gclog_or_tty->print_cr("  Mark word: " PTR_FORMAT, (void*)(obj->mark()));
+          gclog_or_tty->print_cr("  Mark word: " INTPTR_FORMAT, (intptr_t)obj->mark());
         }
         obj->print_on(gclog_or_tty);
         _failures = true;
@@ -3052,9 +3048,9 @@
       // contains the nmethod
       if (!hrrs->strong_code_roots_list_contains(_nm)) {
         gclog_or_tty->print_cr("Code root location " PTR_FORMAT " "
-                              "from nmethod " PTR_FORMAT " not in strong "
-                              "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
-                              p, _nm, hr->bottom(), hr->end());
+                               "from nmethod " PTR_FORMAT " not in strong "
+                               "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
+                               p2i(p), p2i(_nm), p2i(hr->bottom()), p2i(hr->end()));
         _failures = true;
       }
     }
@@ -3110,7 +3106,7 @@
     _young_ref_counter_closure.reset_count();
     k->oops_do(&_young_ref_counter_closure);
     if (_young_ref_counter_closure.count() > 0) {
-      guarantee(k->has_modified_oops(), err_msg("Klass %p, has young refs but is not dirty.", k));
+      guarantee(k->has_modified_oops(), err_msg("Klass " PTR_FORMAT ", has young refs but is not dirty.", p2i(k)));
     }
   }
 };
@@ -3185,7 +3181,7 @@
       size_t word_sz = o->size();
       gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT
                           " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
-                          (void*) o, word_sz,
+                          p2i(o), word_sz,
                           _g1->isMarkedPrev(o),
                           _g1->isMarkedNext(o),
                           _hr->obj_allocated_since_prev_marking(o));
@@ -3194,7 +3190,7 @@
       int *val;
       for (cur = start; cur < end; cur++) {
         val = (int *) cur;
-        gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val);
+        gclog_or_tty->print("\t " PTR_FORMAT ": %d\n", p2i(val), *val);
       }
     }
   }
@@ -3232,7 +3228,7 @@
             gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] "
                                    "max_live_bytes " SIZE_FORMAT " "
                                    "< calculated " SIZE_FORMAT,
-                                   r->bottom(), r->end(),
+                                   p2i(r->bottom()), p2i(r->end()),
                                    r->max_live_bytes(),
                                  not_dead_yet_cl.live_bytes());
             _failures = true;
@@ -3449,10 +3445,10 @@
   st->print(" %-20s", "garbage-first heap");
   st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
             capacity()/K, used_unlocked()/K);
-  st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-            _hrm.reserved().start(),
-            _hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords,
-            _hrm.reserved().end());
+  st->print(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+            p2i(_hrm.reserved().start()),
+            p2i(_hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords),
+            p2i(_hrm.reserved().end()));
   st->cr();
   st->print("  region size " SIZE_FORMAT "K, ", HeapRegion::GrainBytes / K);
   uint young_regions = _young_list->length();
@@ -3470,7 +3466,7 @@
 
   // Print the per-region information.
   st->cr();
-  st->print_cr("Heap Regions: (Y=young(eden), SU=young(survivor), "
+  st->print_cr("Heap Regions: (E=young(eden), S=young(survivor), O=old, "
                "HS=humongous(starts), HC=humongous(continues), "
                "CS=collection set, F=free, TS=gc time stamp, "
                "PTAMS=previous top-at-mark-start, "
@@ -4450,7 +4446,7 @@
                                                oop old) {
   assert(obj_in_cs(old),
          err_msg("obj: " PTR_FORMAT " should still be in the CSet",
-                 (HeapWord*) old));
+                 p2i(old)));
   markOop m = old->mark();
   oop forward_ptr = old->forward_to_atomic(old);
   if (forward_ptr == NULL) {
@@ -4485,7 +4481,7 @@
     assert(old == forward_ptr || !obj_in_cs(forward_ptr),
            err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
                    "should not be in the CSet",
-                   (HeapWord*) old, (HeapWord*) forward_ptr));
+                   p2i(old), p2i(forward_ptr)));
     return forward_ptr;
   }
 }
@@ -5379,8 +5375,7 @@
         _par_scan_state->push_on_queue(p);
       } else {
         assert(!Metaspace::contains((const void*)p),
-               err_msg("Unexpectedly found a pointer from metadata: "
-                              PTR_FORMAT, p));
+               err_msg("Unexpectedly found a pointer from metadata: " PTR_FORMAT, p2i(p)));
         _copy_non_heap_obj_cl->do_oop(p);
       }
     }
@@ -6062,14 +6057,14 @@
 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
                                                HeapWord* tams, HeapWord* end) {
   guarantee(tams <= end,
-            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end));
+            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, p2i(tams), p2i(end)));
   HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
   if (result < end) {
     gclog_or_tty->cr();
     gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT,
-                           bitmap_name, result);
+                           bitmap_name, p2i(result));
     gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT,
-                           bitmap_name, tams, end);
+                           bitmap_name, p2i(tams), p2i(end));
     return false;
   }
   return true;
@@ -6406,10 +6401,10 @@
         !r->rem_set()->is_empty()) {
 
       if (G1TraceEagerReclaimHumongousObjects) {
-        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                                region_idx,
-                               obj->size()*HeapWordSize,
-                               r->bottom(),
+                               (size_t)obj->size()*HeapWordSize,
+                               p2i(r->bottom()),
                                r->region_num(),
                                r->rem_set()->occupied(),
                                r->rem_set()->strong_code_roots_list_length(),
@@ -6425,13 +6420,13 @@
     guarantee(obj->is_typeArray(),
               err_msg("Only eagerly reclaiming type arrays is supported, but the object "
                       PTR_FORMAT " is not.",
-                      r->bottom()));
+                      p2i(r->bottom())));
 
     if (G1TraceEagerReclaimHumongousObjects) {
-      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                              region_idx,
-                             obj->size()*HeapWordSize,
-                             r->bottom(),
+                             (size_t)obj->size()*HeapWordSize,
+                             p2i(r->bottom()),
                              r->region_num(),
                              r->rem_set()->occupied(),
                              r->rem_set()->strong_code_roots_list_length(),
@@ -6585,7 +6580,7 @@
   bool doHeapRegion(HeapRegion* r) {
     if (r->is_young()) {
       gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
-                             r->bottom(), r->end());
+                             p2i(r->bottom()), p2i(r->end()));
       _success = false;
     }
     return false;
@@ -6936,7 +6931,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
       hr->add_strong_code_root_locked(_nm);
@@ -6963,7 +6958,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       hr->remove_strong_code_root(_nm);
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -44,6 +44,7 @@
 #include "memory/barrierSet.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/sharedHeap.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/stack.hpp"
 
 // A "G1CollectedHeap" is an implementation of a java heap for HotSpot.
@@ -1150,21 +1151,11 @@
   // Do sanity check on the contents of the in-cset fast test table.
   bool check_cset_fast_test() PRODUCT_RETURN_( return true; );
 
-  // verify_region_sets() performs verification over the region
-  // lists. It will be compiled in the product code to be used when
-  // necessary (i.e., during heap verification).
   void verify_region_sets();
 
   // verify_region_sets_optional() is planted in the code for
-  // list verification in non-product builds (and it can be enabled in
-  // product builds by defining HEAP_REGION_SET_FORCE_VERIFY to be 1).
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() {
-    verify_region_sets();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  // list verification in debug builds.
+  void verify_region_sets_optional() { DEBUG_ONLY(verify_region_sets();) }
 
 #ifdef ASSERT
   bool is_on_master_free_list(HeapRegion* hr) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#ifndef __clang_major__
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "gc_implementation/g1/concurrentG1Refine.hpp"
 #include "gc_implementation/g1/concurrentMark.hpp"
@@ -288,7 +284,7 @@
   if (confidence_perc > 100) {
     confidence_perc = 100;
     warning("G1ConfidencePercent is set to a value that is too large, "
-            "it's been updated to %u", confidence_perc);
+            "it's been updated to " UINTX_FORMAT, confidence_perc);
   }
   _sigma = (double) confidence_perc / 100.0;
 
@@ -310,7 +306,7 @@
   if (reserve_perc > 50) {
     reserve_perc = 50;
     warning("G1ReservePercent is set to a value that is too large, "
-            "it's been updated to %u", reserve_perc);
+            "it's been updated to " UINTX_FORMAT, reserve_perc);
   }
   _reserve_factor = (double) reserve_perc / 100.0;
   // This will be set when the heap is expanded
@@ -1853,7 +1849,7 @@
     assert(csr->in_collection_set(), "bad CS");
     st->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
                  HR_FORMAT_PARAMS(csr),
-                 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
+                 p2i(csr->prev_top_at_mark_start()), p2i(csr->next_top_at_mark_start()),
                  csr->age_in_surv_rate_group_cond());
     csr = next;
   }
@@ -2219,7 +2215,7 @@
 void TraceGen0TimeData::print_summary_sd(const char* str,
                                          const NumberSeq* seq) const {
   print_summary(str, seq);
-  gclog_or_tty->print_cr("%+45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
+  gclog_or_tty->print_cr("%45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
                 "(num", seq->num(), seq->sd(), seq->maximum());
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -160,40 +160,43 @@
   } while (0)
 
 
-#define ergo_verbose(_tag_, _action_)                                   \
-  ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
+#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
+  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
-#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
-  ergo_verbose_common(_tag_, _action_, _extra_format_, 0, 0, 0, 0, 0, 0)
+#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
+  ergo_verbose6(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, "")
 
-#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
-                      _arg0_)                                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, 0, 0, 0, 0, 0)
+#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
+  ergo_verbose5(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, "")
+
+#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_)                           \
+  ergo_verbose4(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, "")
 
 #define ergo_verbose2(_tag_, _action_, _extra_format_,                  \
                       _arg0_, _arg1_)                                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, 0, 0, 0, 0)
+  ergo_verbose3(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, "")
 
-#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_)                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, 0, 0, 0)
+#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
+                      _arg0_)                                           \
+  ergo_verbose2(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, "")
 
-#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, 0, 0)
 
-#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, 0)
+#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
+  ergo_verbose1(_tag_, _action_, _extra_format_ "%s",                   \
+                "")
+
+#define ergo_verbose(_tag_, _action_)                                   \
+  ergo_verbose0(_tag_, _action_, "")
 
-#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -33,7 +33,7 @@
   bool doHeapRegion(HeapRegion* r) {
     EventG1HeapRegionInformation evt;
     evt.set_index(r->hrm_index());
-    // XXX TODO evt.set_type(r->get_trace_type());
+    evt.set_type(r->get_trace_type());
     evt.set_start((uintptr_t)r->bottom());
     evt.set_used(r->used());
     evt.commit();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -26,18 +26,12 @@
 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
 
 #include "gc_implementation/g1/heapRegion.hpp"
+#include "utilities/macros.hpp"
 
 // Large buffer for some cases where the output might be larger than normal.
 #define HRS_ERR_MSG_BUFSZ 512
 typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
 
-// Set verification will be forced either if someone defines
-// HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
-// asserts are compiled in.
-#ifndef HEAP_REGION_SET_FORCE_VERIFY
-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
-#endif // HEAP_REGION_SET_FORCE_VERIFY
-
 class hrs_ext_msg;
 
 class HRSMtSafeChecker : public CHeapObj<mtGC> {
@@ -145,13 +139,7 @@
   void verify_next_region(HeapRegion* hr);
   void verify_end();
 
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() {
-    verify();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  void verify_optional() { DEBUG_ONLY(verify();) }
 
   virtual void print_on(outputStream* out, bool print_contents = false);
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -401,7 +401,9 @@
   start_array()->set_covered_region(new_memregion);
   Universe::heap()->barrier_set()->resize_covered_region(new_memregion);
 
-  // ALWAYS do this last!!
+  // The update of the space's end is done by this call.  As that
+  // makes the new space available for concurrent allocation, this
+  // must be the last step when expanding.
   object_space()->initialize(new_memregion,
                              SpaceDecorator::DontClear,
                              SpaceDecorator::DontMangle);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -38,6 +38,7 @@
     // we need to ensure that it is copied (see comment in
     // ParScanClosure::do_oop_work).
     Klass* objK = obj->klass();
+    OrderAccess::loadload();
     markOop m = obj->mark();
     oop new_obj;
     if (m->is_marked()) { // Contains forwarding pointer.
@@ -101,6 +102,7 @@
       // overwritten with an overflow next pointer after the object is
       // forwarded.
       Klass* objK = obj->klass();
+      OrderAccess::loadload();
       markOop m = obj->mark();
       oop new_obj;
       if (m->is_marked()) { // Contains forwarding pointer.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/shared/mutableSpace.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/shared/mutableSpace.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -28,6 +28,7 @@
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "gc_implementation/shared/spaceDecorator.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
 #endif // INCLUDE_ALL_GCS
@@ -124,7 +125,11 @@
   }
 
   set_bottom(mr.start());
-  set_end(mr.end());
+  // When expanding concurrently with callers of cas_allocate, setting end
+  // makes the new space available for allocation by other threads.  So this
+  // assignment must follow all other configuration and initialization that
+  // might be done for expansion.
+  OrderAccess::release_store_ptr(end_addr(), mr.end());
 
   if (clear_space) {
     clear(mangle_space);
@@ -192,7 +197,11 @@
 // This version is lock-free.
 HeapWord* MutableSpace::cas_allocate(size_t size) {
   do {
-    HeapWord* obj = top();
+    // Read top before end, else the range check may pass when it shouldn't.
+    // If end is read first, other threads may advance end and top such that
+    // current top > old end and current top + size > current end.  Then
+    // pointer_delta underflows, allowing installation of top > current end.
+    HeapWord* obj = (HeapWord*)OrderAccess::load_ptr_acquire(top_addr());
     if (pointer_delta(end(), obj) >= size) {
       HeapWord* new_top = obj + size;
       HeapWord* result = (HeapWord*)Atomic::cmpxchg_ptr(new_top, top_addr(), obj);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/interpreter/interpreterRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/interpreter/interpreterRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1206,6 +1206,7 @@
         } else {
           // debugging suppport
           if (PrintSignatureHandlers) {
+            ttyLocker ttyl;
             tty->cr();
             tty->print_cr("argument handler #%d for: %s %s (fingerprint = " UINT64_FORMAT ", %d bytes generated)",
                           _handlers->length(),
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -238,6 +238,10 @@
  JfrJavaLog::log(tag_set, level, message, thread);
 JVM_END
 
+JVM_ENTRY_NO_ENV(jboolean, jfr_should_log(JNIEnv* env, jobject jvm, jint level))
+ return JfrJavaLog::should_log(level, thread) ? JNI_TRUE : JNI_FALSE;
+JVM_END
+
 JVM_ENTRY_NO_ENV(void, jfr_subscribe_log_level(JNIEnv* env, jobject jvm, jobject log_tag, jint id))
  JfrJavaLog::subscribe_log_level(log_tag, id, thread);
 JVM_END
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -67,6 +67,8 @@
 
 void JNICALL jfr_log(JNIEnv* env, jobject jvm, jint tag_set, jint level, jstring message);
 
+jboolean JNICALL jfr_should_log(JNIEnv* env, jobject jvm, jint level);
+
 void JNICALL jfr_retransform_classes(JNIEnv* env, jobject jvm, jobjectArray classes);
 
 void JNICALL jfr_set_enabled(JNIEnv* env, jobject jvm, jlong event_type_id, jboolean enabled);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -49,6 +49,7 @@
       (char*)"getTicksFrequency", (char*)"()J", (void*)jfr_elapsed_frequency,
       (char*)"subscribeLogLevel", (char*)"(Ljdk/jfr/internal/LogTag;I)V", (void*)jfr_subscribe_log_level,
       (char*)"log", (char*)"(IILjava/lang/String;)V", (void*)jfr_log,
+      (char*)"shouldLog", (char*)"(I)Z", (void*)jfr_should_log,
       (char*)"retransformClasses", (char*)"([Ljava/lang/Class;)V", (void*)jfr_retransform_classes,
       (char*)"setEnabled", (char*)"(JZ)V", (void*)jfr_set_enabled,
       (char*)"setFileNotification", (char*)"(J)V", (void*)jfr_set_file_notification,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -151,13 +151,12 @@
 }
 
 void MonitorInflateCauseConstant::serialize(JfrCheckpointWriter& writer) {
-  // XXX no such counters. implement?
-//  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
-//  writer.write_count(nof_entries);
-//  for (u4 i = 0; i < nof_entries; ++i) {
-//    writer.write_key(i);
-//    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
-//  }
+  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
+  writer.write_count(nof_entries);
+  for (u4 i = 0; i < nof_entries; ++i) {
+    writer.write_key(i);
+    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
+  }
 }
 
 void GCCauseConstant::serialize(JfrCheckpointWriter& writer) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -29,6 +29,7 @@
 const julong MAX_ADJUSTED_GLOBAL_BUFFER_SIZE = 1 * M;
 const julong MIN_ADJUSTED_GLOBAL_BUFFER_SIZE_CUTOFF = 512 * K;
 const julong MIN_GLOBAL_BUFFER_SIZE = 64 * K;
+const julong MAX_GLOBAL_BUFFER_SIZE = 2 * G;
 // implies at least 2 * MIN_GLOBAL_BUFFER SIZE
 const julong MIN_BUFFER_COUNT = 2;
 // MAX global buffer count open ended
@@ -36,6 +37,7 @@
 // MAX thread local buffer size == size of a single global buffer (runtime determined)
 // DEFAULT thread local buffer size = 2 * os page size (runtime determined)
 const julong MIN_THREAD_BUFFER_SIZE = 4 * K;
+const julong MAX_THREAD_BUFFER_SIZE = 2 * G;
 const julong MIN_MEMORY_SIZE = 1 * M;
 const julong DEFAULT_MEMORY_SIZE = 10 * M;
 
@@ -304,6 +306,11 @@
   options->global_buffer_size = div_total_by_units(options->memory_size, options->buffer_count);
   if (options->thread_buffer_size > options->global_buffer_size) {
     options->global_buffer_size = options->thread_buffer_size;
+    if (options->memory_size_configured) {
+      options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
+    } else {
+      options->memory_size = multiply(options->global_buffer_size, options->buffer_count);
+    }
     options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
   }
   assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
@@ -323,7 +330,8 @@
   assert(options->memory_size % os::vm_page_size() == 0, "invariant");
   assert(options->global_buffer_size % os::vm_page_size() == 0, "invariant");
   assert(options->thread_buffer_size % os::vm_page_size() == 0, "invariant");
-  assert(options->buffer_count > 0, "invariant");
+  assert(options->buffer_count >= MIN_BUFFER_COUNT, "invariant");
+  assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
 }
 #endif
 
@@ -428,6 +436,10 @@
     default:
       default_size(options);
   }
+  if (options->buffer_count < MIN_BUFFER_COUNT ||
+      options->global_buffer_size < options->thread_buffer_size) {
+    return false;
+  }
   DEBUG_ONLY(assert_post_condition(options);)
   return true;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -32,6 +32,8 @@
 extern const julong MIN_GLOBAL_BUFFER_SIZE;
 extern const julong MIN_MEMORY_SIZE;
 extern const julong MIN_THREAD_BUFFER_SIZE;
+extern const julong MAX_GLOBAL_BUFFER_SIZE;
+extern const julong MAX_THREAD_BUFFER_SIZE;
 
 struct JfrMemoryOptions {
   julong memory_size;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -390,34 +390,41 @@
   return value;
 }
 
-template <typename Argument>
-static void log_lower_than_min_value(Argument& memory_argument, julong min_value) {
+static const char higher_than_msg[] = "This value is higher than the maximum size limited ";
+static const char lower_than_msg[] = "This value is lower than the minimum size required ";
+template <typename Argument, bool lower>
+static void log_out_of_range_value(Argument& memory_argument, julong min_value) {
+  const char* msg = lower ? lower_than_msg : higher_than_msg;
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "This value is lower than the minimum size required " JULONG_FORMAT "%c",
+      "%s" JULONG_FORMAT "%c", msg,
       divide_with_user_unit(memory_argument, min_value),
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "This value is lower than the minimum size required " JULONG_FORMAT,
+    "%s" JULONG_FORMAT, msg,
     divide_with_user_unit(memory_argument, min_value));
 }
 
+static const char default_val_msg[] = "Value default for option ";
+static const char specified_val_msg[] = "Value specified for option ";
 template <typename Argument>
 static void log_set_value(Argument& memory_argument) {
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "Value specified for option \"%s\" is " JULONG_FORMAT "%c",
+      "%s\"%s\" is " JULONG_FORMAT "%c",
+      memory_argument.is_set() ? specified_val_msg: default_val_msg,
       memory_argument.name(),
       memory_argument.value()._val,
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "Value specified for option \"%s\" is " JULONG_FORMAT,
+    "%s\"%s\" is " JULONG_FORMAT,
+    memory_argument.is_set() ? specified_val_msg: default_val_msg,
     memory_argument.name(), memory_argument.value()._val);
 }
 
@@ -538,6 +545,10 @@
         return false;
       }
     }
+  } else if (options.thread_buffer_size_configured && options.memory_size_configured) {
+    if (!ensure_first_gteq_second(_dcmd_memorysize, _dcmd_threadbuffersize)) {
+      return false;
+    }
   }
   return true;
 }
@@ -606,7 +617,7 @@
 static bool ensure_gteq(Argument& memory_argument, const jlong value) {
   if ((jlong)memory_argument.value()._size < value) {
     log_set_value(memory_argument);
-    log_lower_than_min_value(memory_argument, value);
+    log_out_of_range_value<Argument, true>(memory_argument, value);
     return false;
   }
   return true;
@@ -637,6 +648,30 @@
   return true;
 }
 
+template <typename Argument>
+static bool ensure_lteq(Argument& memory_argument, const jlong value) {
+  if ((jlong)memory_argument.value()._size > value) {
+    log_set_value(memory_argument);
+    log_out_of_range_value<Argument, false>(memory_argument, value);
+    return false;
+  }
+  return true;
+}
+
+static bool ensure_valid_maximum_sizes() {
+  if (_dcmd_globalbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_globalbuffersize, MAX_GLOBAL_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  if (_dcmd_threadbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_threadbuffersize, MAX_THREAD_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Starting with the initial set of memory values from the user,
  * sanitize, enforce min/max rules and adjust to a set of consistent options.
@@ -644,7 +679,7 @@
  * Adjusted memory sizes will be page aligned.
  */
 bool JfrOptionSet::adjust_memory_options() {
-  if (!ensure_valid_minimum_sizes()) {
+  if (!ensure_valid_minimum_sizes() || !ensure_valid_maximum_sizes()) {
     return false;
   }
   JfrMemoryOptions options;
@@ -653,6 +688,24 @@
     return false;
   }
   if (!JfrMemorySizer::adjust_options(&options)) {
+    if (options.buffer_count < MIN_BUFFER_COUNT || options.global_buffer_size < options.thread_buffer_size) {
+      log_set_value(_dcmd_memorysize);
+      log_set_value(_dcmd_globalbuffersize);
+      tty->print_cr("%s \"%s\" is " JLONG_FORMAT,
+        _dcmd_numglobalbuffers.is_set() ? specified_val_msg: default_val_msg,
+        _dcmd_numglobalbuffers.name(), _dcmd_numglobalbuffers.value());
+       log_set_value(_dcmd_threadbuffersize);
+      if (options.buffer_count < MIN_BUFFER_COUNT) {
+        tty->print_cr("numglobalbuffers " JULONG_FORMAT " is less than minimal value " JULONG_FORMAT,
+          options.buffer_count, MIN_BUFFER_COUNT);
+        tty->print_cr("Decrease globalbuffersize/threadbuffersize or increase memorysize");
+      } else {
+        tty->print_cr("globalbuffersize " JULONG_FORMAT " is less than threadbuffersize" JULONG_FORMAT,
+          options.global_buffer_size, options.thread_buffer_size);
+        tty->print_cr("Decrease globalbuffersize or increase memorysize or adjust global/threadbuffersize");
+      }
+      return false;
+    }
     if (!check_for_ambiguity(_dcmd_memorysize, _dcmd_globalbuffersize, _dcmd_numglobalbuffers)) {
       return false;
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -139,3 +139,7 @@
   // log_tag_sets[tag_set].log_tag_set->log((LogLevelType)level, s);
   tty->print_cr("JFR: %s", s);
 }
+
+bool JfrJavaLog::should_log(jint level, TRAPS) {
+  return LogJFR;
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -43,6 +43,7 @@
  public:
   static void subscribe_log_level(jobject log_tag, jint id, TRAPS);
   static void log(jint tag_set, jint level, jstring message, TRAPS);
+  static bool should_log(jint level, TRAPS);
 };
 
 #endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/libadt/set.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/libadt/set.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/libadt/set.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/libadt/set.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -66,7 +66,7 @@
 // The caller must deallocate the string.
 char *Set::setstr() const
 {
-  if( !this ) return os::strdup("{no set}");
+  if( this == NULL ) return os::strdup("{no set}");
   Set &set = clone();           // Virtually copy the basic set.
   set.Sort();                   // Sort elements for in-order retrieval
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -45,9 +45,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class Chunk_t, class FreeList_t>
-size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
-
-template <class Chunk_t, class FreeList_t>
 TreeChunk<Chunk_t, FreeList_t>* TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(Chunk_t* fc) {
   // Do some assertion checking here.
   return (TreeChunk<Chunk_t, FreeList_t>*) fc;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -163,15 +163,17 @@
   Chunk_t* prev() const { return Chunk_t::prev(); }
   size_t size() const volatile { return Chunk_t::size(); }
 
-  static size_t min_size() {
-    return _min_tree_chunk_size;
-  }
+  static size_t min_size();
 
   // debugging
   void verify_tree_chunk_list() const;
   void assert_is_mangled() const;
 };
 
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize;
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::min_size() { return _min_tree_chunk_size; }
 
 template <class Chunk_t, class FreeList_t>
 class BinaryTreeDictionary: public FreeBlockDictionary<Chunk_t> {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/filemap.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/filemap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/filemap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/filemap.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -452,7 +452,7 @@
       // close and remove the file. See bug 6372906.
       close();
       remove(_full_path);
-      fail_stop("Unable to write to shared archive file.", NULL);
+      fail_stop("Unable to write to shared archive file.");
     }
   }
   _file_offset += nbytes;
@@ -471,7 +471,7 @@
       // that the written file is the correct length.
       _file_offset -= 1;
       if (lseek(_fd, (long)_file_offset, SEEK_SET) < 0) {
-        fail_stop("Unable to seek.", NULL);
+        fail_stop("Unable to seek.");
       }
       char zero = 0;
       write_bytes(&zero, 1);
@@ -542,7 +542,7 @@
   // other reserved memory (like the code cache).
   ReservedSpace rs(size, os::vm_allocation_granularity(), false, requested_addr);
   if (!rs.is_reserved()) {
-    fail_continue(err_msg("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr));
+    fail_continue("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr);
     return rs;
   }
   // the reserved virtual memory is for mapping class data sharing archive
@@ -566,7 +566,7 @@
                               requested_addr, size, si->_read_only,
                               si->_allow_exec);
   if (base == NULL || base != si->_base) {
-    fail_continue(err_msg("Unable to map %s shared space at required address.", shared_region_name[i]));
+    fail_continue("Unable to map %s shared space at required address.", shared_region_name[i]);
     return NULL;
   }
 #ifdef _WINDOWS
@@ -605,7 +605,7 @@
 
 void FileMapInfo::assert_mark(bool check) {
   if (!check) {
-    fail_stop("Mark mismatch while restoring from shared file.", NULL);
+    fail_stop("Mark mismatch while restoring from shared file.");
   }
 }
 
@@ -748,7 +748,7 @@
 void FileMapInfo::stop_sharing_and_unmap(const char* msg) {
   FileMapInfo *map_info = FileMapInfo::current_info();
   if (map_info) {
-    map_info->fail_continue(msg);
+    map_info->fail_continue("%s", msg);
     for (int i = 0; i < MetaspaceShared::n_regions; i++) {
       if (map_info->_header->_space[i]._base != NULL) {
         map_info->unmap_region(i);
@@ -756,6 +756,6 @@
       }
     }
   } else if (DumpSharedSpaces) {
-    fail_stop(msg, NULL);
+    fail_stop("%s", msg);
   }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/filemap.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/filemap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/memory/filemap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/memory/filemap.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -196,8 +196,8 @@
   bool  remap_shared_readonly_as_readwrite();
 
   // Errors.
-  static void fail_stop(const char *msg, ...);
-  static void fail_continue(const char *msg, ...);
+  static void fail_stop(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
+  static void fail_continue(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
 
   // Return true if given address is in the mapped shared space.
   bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/chaitin.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/chaitin.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/chaitin.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/chaitin.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2084,7 +2084,7 @@
 // Dump a register name into a buffer.  Be intelligent if we get called
 // before allocation is complete.
 char *PhaseChaitin::dump_register( const Node *n, char *buf  ) const {
-  if( !this ) {                 // Not got anything?
+  if( this == NULL ) {          // Not got anything?
     sprintf(buf,"N%d",n->_idx); // Then use Node index
   } else if( _node_regs ) {
     // Post allocation, use direct mappings, no LRG info available
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/compile.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/compile.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/compile.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/compile.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2084,13 +2084,16 @@
 // They were inserted during parsing (see add_safepoint()) to make
 // infinite loops without calls or exceptions visible to root, i.e.,
 // useful.
-void Compile::remove_root_to_sfpts_edges() {
+void Compile::remove_root_to_sfpts_edges(PhaseIterGVN& igvn) {
   Node *r = root();
   if (r != NULL) {
     for (uint i = r->req(); i < r->len(); ++i) {
       Node *n = r->in(i);
       if (n != NULL && n->is_SafePoint()) {
         r->rm_prec(i);
+        if (n->outcnt() == 0) {
+          igvn.remove_dead_node(n);
+        }
         --i;
       }
     }
@@ -2154,7 +2157,7 @@
 
   // Now that all inlining is over, cut edge from root to loop
   // safepoints
-  remove_root_to_sfpts_edges();
+  remove_root_to_sfpts_edges(igvn);
 
   // Remove the speculative part of types and clean up the graph from
   // the extra CastPP nodes whose only purpose is to carry them. Do
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/compile.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/compile.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/compile.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/compile.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -959,7 +959,7 @@
   void inline_incrementally(PhaseIterGVN& igvn);
   void inline_string_calls(bool parse_time);
   void inline_boxing_calls(PhaseIterGVN& igvn);
-  void remove_root_to_sfpts_edges();
+  void remove_root_to_sfpts_edges(PhaseIterGVN& igvn);
 
   // Matching, CFG layout, allocation, code generation
   PhaseCFG*         cfg()                       { return _cfg; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/output.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/output.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/opto/output.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/opto/output.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -28,6 +28,7 @@
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compileBroker.hpp"
+#include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "memory/allocation.inline.hpp"
 #include "opto/callnode.hpp"
@@ -1510,8 +1511,17 @@
       }
 
 #ifdef ASSERT
-      if (n->size(_regalloc) < (current_offset-instr_offset)) {
+      uint n_size = n->size(_regalloc);
+      if (n_size < (current_offset-instr_offset)) {
+        MachNode* mach = n->as_Mach();
         n->dump();
+        mach->dump_format(_regalloc, tty);
+        tty->print_cr(" n_size (%d), current_offset (%d), instr_offset (%d)", n_size, current_offset, instr_offset);
+        Disassembler::decode(cb->insts_begin() + instr_offset, cb->insts_begin() + current_offset + 1, tty);
+        tty->print_cr(" ------------------- ");
+        BufferBlob* blob = this->scratch_buffer_blob();
+        address blob_begin = blob->content_begin();
+        Disassembler::decode(blob_begin, blob_begin + n_size + 1, tty);
         assert(false, "wrong size of mach node");
       }
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jni.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jni.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jni.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jni.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1454,7 +1454,7 @@
                                env, clazz, (uintptr_t) methodID);
 #endif /* USDT2 */
   jobject obj = NULL;
-  DT_RETURN_MARK(NewObjectA, jobject, (const jobject)obj);
+  DT_RETURN_MARK(NewObjectA, jobject, (const jobject&)obj);
 
   instanceOop i = alloc_object(clazz, CHECK_NULL);
   obj = JNIHandles::make_local(env, i);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvm.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvm.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvm.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvm.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1772,6 +1772,18 @@
         found = (k() == inner_klass);
         if (found && ooff != 0) {
           ok = i_cp->klass_at(ooff, CHECK_NULL);
+          if (!ok->oop_is_instance()) {
+            // If the outer class is not an instance klass then it cannot have
+            // declared any inner classes.
+            ResourceMark rm(THREAD);
+            Exceptions::fthrow(
+              THREAD_AND_LOCATION,
+              vmSymbols::java_lang_IncompatibleClassChangeError(),
+              "%s and %s disagree on InnerClasses attribute",
+              ok->external_name(),
+              k->external_name());
+            return NULL;
+          }
           outer_klass = instanceKlassHandle(thread, ok);
           *inner_is_member = true;
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiEnvBase.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiEnvBase.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1092,7 +1092,7 @@
           // If the monitor has no owner, then a non-suspended contending
           // thread could potentially change the state of the monitor by
           // entering it. The JVM/TI spec doesn't allow this.
-          if (owning_thread == NULL && !at_safepoint &
+          if (owning_thread == NULL && !at_safepoint &&
               !JvmtiEnv::is_thread_fully_suspended(pending_thread, true, &debug_bits)) {
             if (ret.owner != NULL) {
               destroy_jni_reference(calling_thread, ret.owner);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiImpl.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiImpl.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiImpl.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiImpl.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -64,6 +64,7 @@
 
 class GrowableElement : public CHeapObj<mtInternal> {
 public:
+  virtual ~GrowableElement() {}
   virtual address getCacheValue()          =0;
   virtual bool equals(GrowableElement* e)  =0;
   virtual bool lessThan(GrowableElement *e)=0;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiTagMap.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiTagMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/jvmtiTagMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/jvmtiTagMap.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -2805,6 +2805,7 @@
   return true;
 }
 
+#ifdef ASSERT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2819,6 +2820,7 @@
     return false;
   }
 }
+#endif // #ifdef ASSERT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/methodHandles.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/methodHandles.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/prims/methodHandles.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/prims/methodHandles.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -972,6 +972,13 @@
       return mname;
     }
   }
+
+  if (new_index < len) {
+    assert(JNIHandles::resolve(this->at(new_index)) == NULL, "sanity");
+    // destroy the old handle
+    JNIHandles::destroy_weak_global(this->at(new_index));
+  }
+
   // Not found, push the new one, or reuse empty slot
   this->at_put_grow(new_index, mem_name_wref);
   return new_mem_name;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/arguments.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/arguments.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/arguments.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/arguments.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -3314,6 +3314,12 @@
     } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) {
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStderr", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStdout", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, true);
     } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
 #if defined(DTRACE_ENABLED)
       FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/globals.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/globals.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/globals.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/globals.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -2699,6 +2699,12 @@
   product(bool, DisplayVMOutputToStdout, false,                             \
           "If DisplayVMOutput is true, display all VM output to stdout")    \
                                                                             \
+  product(bool, ErrorFileToStderr, false,                                   \
+          "If true, error data is printed to stderr instead of a file")     \
+                                                                            \
+  product(bool, ErrorFileToStdout, false,                                   \
+          "If true, error data is printed to stdout instead of a file")     \
+                                                                            \
   product(bool, UseHeavyMonitors, false,                                    \
           "use heavyweight instead of lightweight Java monitors")           \
                                                                             \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/mutex.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/mutex.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/mutex.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/mutex.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -283,16 +283,6 @@
   return x & 0x7FFFFFFF ;
 }
 
-static inline jint MarsagliaXOR (jint * const a) {
-  jint x = *a ;
-  if (x == 0) x = UNS(a)|1 ;
-  x ^= x << 6;
-  x ^= ((unsigned)x) >> 21;
-  x ^= x << 7 ;
-  *a = x ;
-  return x & 0x7FFFFFFF ;
-}
-
 static int Stall (int its) {
   static volatile jint rv = 1 ;
   volatile int OnFrame = 0 ;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/perfData.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/perfData.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/perfData.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/perfData.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -288,7 +288,7 @@
     void *_valuep;
 
     PerfData(CounterNS ns, const char* name, Units u, Variability v);
-    ~PerfData();
+    virtual ~PerfData();
 
     // create the entry for the PerfData item in the PerfData memory region.
     // this region is maintained separately from the PerfData objects to
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/safepoint.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/safepoint.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/safepoint.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/safepoint.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -1118,6 +1118,7 @@
   if( nm->is_at_poll_return(real_return_addr) ) {
     // See if return type is an oop.
     bool return_oop = nm->method()->is_returning_oop();
+    HandleMark hm(thread());
     Handle return_value;
     if (return_oop) {
       // The oop result has been saved on the stack together with all
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/sharedRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/sharedRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/sharedRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/sharedRuntime.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -716,6 +716,7 @@
 #endif
 
   if (t == NULL) {
+    ttyLocker ttyl;
     tty->print_cr("MISSING EXCEPTION HANDLER for pc " INTPTR_FORMAT " and handler bci %d", ret_pc, handler_bci);
     tty->print_cr("   Exception:");
     exception->print();
@@ -2633,8 +2634,8 @@
     BufferBlob*  buf = buffer_blob(); // the temporary code buffer in CodeCache
     if (buf != NULL) {
       CodeBuffer buffer(buf);
-      double locs_buf[20];
-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
+      struct { double data[20]; } locs_buf;
+      buffer.insts()->initialize_shared_locs((relocInfo*)&locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
       MacroAssembler _masm(&buffer);
 
       // Fill in the signature array, for the calling-convention call.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/synchronizer.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/synchronizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/synchronizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/synchronizer.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -216,7 +216,9 @@
      }
   }
 
-  ObjectSynchronizer::inflate(THREAD, object)->exit (true, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              object,
+                              inflate_cause_vm_internal)->exit(true, THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -258,7 +260,9 @@
   // must be non-zero to avoid looking like a re-entrant lock,
   // and must not look locked either.
   lock->set_displaced_header(markOopDesc::unused_mark());
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_monitor_enter)->enter(THREAD);
 }
 
 // This routine is used to handle interpreter/compiler slow case
@@ -288,7 +292,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   return monitor->complete_exit(THREAD);
 }
@@ -301,7 +307,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   monitor->reenter(recursion, THREAD);
 }
@@ -316,7 +324,7 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
   THREAD->set_current_pending_monitor_is_from_java(false);
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD, obj(), inflate_cause_jni_enter)->enter(THREAD);
   THREAD->set_current_pending_monitor_is_from_java(true);
 }
 
@@ -342,7 +350,9 @@
   }
   assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj);
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj,
+                                                       inflate_cause_jni_exit);
   // If this thread has locked the object, exit the monitor.  Note:  can't use
   // monitor->check(CHECK); must exit even if an exception is pending.
   if (monitor->check(THREAD)) {
@@ -385,7 +395,10 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_wait);
+
   DTRACE_MONITOR_WAIT_PROBE(monitor, obj(), THREAD, millis);
   monitor->wait(millis, true, THREAD);
 
@@ -404,7 +417,9 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectSynchronizer::inflate(THREAD, obj()) -> wait(millis, false, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_wait)->wait(millis, false, THREAD) ;
 }
 
 void ObjectSynchronizer::notify(Handle obj, TRAPS) {
@@ -417,7 +432,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notify(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notify(THREAD);
 }
 
 // NOTE: see comment of notify()
@@ -431,7 +448,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notifyAll(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notifyAll(THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -686,7 +705,7 @@
   }
 
   // Inflate the monitor to set hash code
-  monitor = ObjectSynchronizer::inflate(Self, obj);
+  monitor = ObjectSynchronizer::inflate(Self, obj, inflate_cause_hash_code);
   // Load displaced header and check it has hash code
   mark = monitor->header();
   assert (mark->is_neutral(), "invariant") ;
@@ -1183,12 +1202,29 @@
     TEVENT (omFlush) ;
 }
 
+const char* ObjectSynchronizer::inflate_cause_name(const InflateCause cause) {
+  switch (cause) {
+    case inflate_cause_vm_internal:    return "VM Internal";
+    case inflate_cause_monitor_enter:  return "Monitor Enter";
+    case inflate_cause_wait:           return "Monitor Wait";
+    case inflate_cause_notify:         return "Monitor Notify";
+    case inflate_cause_hash_code:      return "Monitor Hash Code";
+    case inflate_cause_jni_enter:      return "JNI Monitor Enter";
+    case inflate_cause_jni_exit:       return "JNI Monitor Exit";
+    default:
+      ShouldNotReachHere();
+  }
+  return "Unknown";
+}
+
 static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
-                                       const oop obj) {
+                                       const oop obj,
+                                       const ObjectSynchronizer::InflateCause cause) {
   assert(event != NULL, "invariant");
   assert(event->should_commit(), "invariant");
   event->set_monitorClass(obj->klass());
   event->set_address((uintptr_t)(void*)obj);
+  event->set_cause((u1)cause);
   event->commit();
 }
 
@@ -1200,7 +1236,9 @@
     assert(mark->monitor()->header()->is_neutral(), "monitor must record a good object header");
     return mark->monitor();
   }
-  return ObjectSynchronizer::inflate(Thread::current(), obj);
+  return ObjectSynchronizer::inflate(Thread::current(),
+                                     obj,
+                                     inflate_cause_vm_internal);
 }
 
 
@@ -1208,7 +1246,9 @@
 // multiple locks occupy the same $ line.  Padding might be appropriate.
 
 
-ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self, oop object) {
+ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self,
+                                                  oop object,
+                                                  const InflateCause cause) {
   // Inflate mutates the heap ...
   // Relaxing assertion for bug 6320749.
   assert (Universe::verify_in_progress() ||
@@ -1347,7 +1387,7 @@
             }
           }
           if (event.should_commit()) {
-            post_monitor_inflate_event(&event, object);
+            post_monitor_inflate_event(&event, object, cause);
           }
           return m ;
       }
@@ -1400,7 +1440,7 @@
         }
       }
       if (event.should_commit()) {
-        post_monitor_inflate_event(&event, object);
+        post_monitor_inflate_event(&event, object, cause);
       }
       return m ;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/synchronizer.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/synchronizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/synchronizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/synchronizer.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -42,6 +42,18 @@
     owner_none,
     owner_other
   } LockOwnership;
+
+  typedef enum {
+    inflate_cause_vm_internal = 0,
+    inflate_cause_monitor_enter = 1,
+    inflate_cause_wait = 2,
+    inflate_cause_notify = 3,
+    inflate_cause_hash_code = 4,
+    inflate_cause_jni_enter = 5,
+    inflate_cause_jni_exit = 6,
+    inflate_cause_nof = 7 // Number of causes
+  } InflateCause;
+
   // exit must be implemented non-blocking, since the compiler cannot easily handle
   // deoptimization at monitor exit. Hence, it does not take a Handle argument.
 
@@ -90,9 +102,10 @@
   static void omFlush   (Thread * Self) ;
 
   // Inflate light weight monitor to heavy weight monitor
-  static ObjectMonitor* inflate(Thread * Self, oop obj);
+  static ObjectMonitor* inflate(Thread * Self, oop obj, const InflateCause cause);
   // This version is only for internal use
   static ObjectMonitor* inflate_helper(oop obj);
+  static const char* inflate_cause_name(const InflateCause cause);
 
   // Returns the identity hash value for an oop
   // NOTE: It may cause monitor inflation
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/vframe.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/vframe.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/runtime/vframe.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/runtime/vframe.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -397,6 +397,7 @@
     // as it were a native compiled frame (no Java-level assumptions).
 #ifdef ASSERT
     if (WizardMode) {
+      ttyLocker ttyl;
       tty->print_cr("Error in fill_from_frame: pc_desc for "
                     INTPTR_FORMAT " not found or invalid at %d",
                     p2i(_frame.pc()), decode_offset);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/debug.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/debug.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/debug.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/debug.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -447,12 +447,13 @@
 extern "C" void disnm(intptr_t p) {
   Command c("disnm");
   CodeBlob* cb = CodeCache::find_blob((address) p);
-  nmethod* nm = cb->as_nmethod_or_null();
-  if (nm) {
-    nm->print();
-    Disassembler::decode(nm);
-  } else {
-    cb->print();
+  if (cb != NULL) {
+    nmethod* nm = cb->as_nmethod_or_null();
+    if (nm != NULL) {
+      nm->print();
+    } else {
+      cb->print();
+    }
     Disassembler::decode(cb);
   }
 }
@@ -687,6 +688,7 @@
   tty->print_cr("  pns(void* sp, void* fp, void* pc)  - print native (i.e. mixed) stack trace. E.g.");
   tty->print_cr("                   pns($sp, $rbp, $pc) on Linux/amd64 and Solaris/amd64 or");
   tty->print_cr("                   pns($sp, $ebp, $pc) on Linux/x86 or");
+  tty->print_cr("                   pns($sp, $fp, $pc)  on Linux/AArch64 or");
   tty->print_cr("                   pns($sp, 0, $pc)    on Linux/ppc64 or");
   tty->print_cr("                   pns($sp + 0x7ff, 0, $pc) on Solaris/SPARC");
   tty->print_cr("                 - in gdb do 'set overload-resolution off' before calling pns()");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/debug.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/debug.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/debug.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/debug.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -156,6 +156,9 @@
   #define assert_if_no_error(cond,msg)
 #endif // #ifdef ASSERT
 
+#define precond(p)   assert(p, "precond")
+#define postcond(p)  assert(p, "postcond")
+
 // guarantee is like assert except it's always executed -- use it for
 // cheap tests that catch errors that would otherwise be hard to find.
 // guarantee is also used for Verify options.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/decoder_elf.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/decoder_elf.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/decoder_elf.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/decoder_elf.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -37,7 +37,7 @@
     _opened_elf_files = NULL;
     _decoder_status = no_error;
   }
-  ~ElfDecoder();
+  virtual ~ElfDecoder();
 
   bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/decoder.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/decoder.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/decoder.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/decoder.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -32,6 +32,7 @@
 
 class AbstractDecoder : public CHeapObj<mtInternal> {
 public:
+  virtual ~AbstractDecoder() {}
   // status code for decoding native C frame
   enum decoder_status {
          not_available = -10,  // real decoder is not available
@@ -78,7 +79,7 @@
     _decoder_status = not_available;
   }
 
-  ~NullDecoder() {};
+  virtual ~NullDecoder() {};
 
   virtual bool decode(address pc, char* buf, int buflen, int* offset,
     const char* modulepath = NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -29,6 +29,11 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+// Needed for INT64_C and UINT64_C with ISO C99 libraries (see JDK-8272214)
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+
 #ifdef TARGET_COMPILER_gcc
 # include "utilities/globalDefinitions_gcc.hpp"
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions_visCPP.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions_visCPP.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -77,6 +77,15 @@
 // pointer is stored as integer value.
 #define NULL_WORD NULL
 
+// Some MS Visual Studio versions do not seem to have INT64_C and UINT64_C
+// even with __STDC_CONSTANT_MACROS defined.
+#ifndef INT64_C
+#define INT64_C(c)  (c ## i64)
+#endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## ui64)
+#endif
+
 // Compiler-specific primitive types
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/hashtable.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/hashtable.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/hashtable.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/hashtable.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -94,8 +94,6 @@
   return false;
 }
 
-template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
-
 // Create a new table and using alternate hash code, populate the new table
 // with the existing elements.   This can be used to change the hash code
 // and could in the future change the size of the table.
@@ -219,7 +217,7 @@
       if (*top + entry_size() > end) {
         report_out_of_shared_space(SharedMiscData);
       }
-      *p = (BasicHashtableEntry<F>*)memcpy(*top, *p, entry_size());
+      *p = (BasicHashtableEntry<F>*)memcpy(*top, (void*)*p, entry_size());
       *top += entry_size();
     }
   }
@@ -333,7 +331,7 @@
   if (*top + len > end) {
     report_out_of_shared_space(SharedMiscData);
   }
-  _buckets = (HashtableBucket<F>*)memcpy(*top, _buckets, len);
+  _buckets = (HashtableBucket<F>*)memcpy(*top, (void*)_buckets, len);
   *top += len;
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/hashtable.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/hashtable.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/hashtable.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/hashtable.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -314,8 +314,8 @@
 
   // Function to move these elements into the new table.
   void move_to(RehashableHashtable<T, F>* new_table);
-  static bool use_alternate_hashcode()  { return _seed != 0; }
-  static juint seed()                    { return _seed; }
+  static bool use_alternate_hashcode();
+  static juint seed();
 
   static int literal_size(Symbol *symbol);
   static int literal_size(oop oop);
@@ -333,6 +333,9 @@
   static juint _seed;
 };
 
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::seed() { return _seed; };
+template <class T, MEMFLAGS F> bool  RehashableHashtable<T, F>::use_alternate_hashcode() { return _seed != 0; };
 
 //  Verions of hashtable where two handles are used to compute the index.
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/ostream.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/ostream.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/ostream.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/ostream.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -673,7 +673,10 @@
 static int vsnprintf_wrapper(char* buf, size_t len, const char* fmt, ...) {
   va_list args;
   va_start(args, fmt);
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
   int result = os::vsnprintf(buf, len, fmt, args);
+PRAGMA_DIAG_POP
   va_end(args);
   return result;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/taskqueue.hpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/taskqueue.hpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/taskqueue.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/taskqueue.hpp	2021-08-09 15:12:52.000000000 +0000
@@ -430,9 +430,7 @@
 }
 
 template<class E, MEMFLAGS F, unsigned int N>
-GenericTaskQueue<E, F, N>::~GenericTaskQueue() {
-  FREE_C_HEAP_ARRAY(E, _elems, F);
-}
+GenericTaskQueue<E, F, N>::~GenericTaskQueue() {}
 
 // OverflowTaskQueue is a TaskQueue that also includes an overflow stack for
 // elements that do not fit in the TaskQueue.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/vmError.cpp openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/vmError.cpp
--- openjdk-8-8u292-b10/=unpacked-tar2=/src/share/vm/utilities/vmError.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/src/share/vm/utilities/vmError.cpp	2021-08-09 15:12:52.000000000 +0000
@@ -984,12 +984,16 @@
     }
   }
 
-  // print to screen
+  // Part 1: print an abbreviated version (the '#' section) to stdout.
   if (!out_done) {
     first_error->_verbose = false;
 
-    staticBufferStream sbs(buffer, sizeof(buffer), &out);
-    first_error->report(&sbs);
+    // Suppress this output if we plan to print Part 2 to stdout too.
+    // No need to have the "#" section twice.
+    if (!(ErrorFileToStdout && out.fd() == 1)) {
+      staticBufferStream sbs(buffer, sizeof(buffer), &out);
+      first_error->report(&sbs);
+    }
 
     out_done = true;
 
@@ -997,6 +1001,7 @@
     first_error->_current_step_info = "";   // reset current_step string
   }
 
+  // Part 2: print a full error log file (optionally to stdout or stderr).
   // print to error log file
   if (!log_done) {
     first_error->_verbose = true;
@@ -1004,19 +1009,26 @@
     // see if log file is already open
     if (!log.is_open()) {
       // open log file
-      int fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
-      if (fd != -1) {
-        out.print_raw("# An error report file with more information is saved as:\n# ");
-        out.print_raw_cr(buffer);
-
-        log.set_fd(fd);
+      int fd;
+      if (ErrorFileToStdout) {
+        fd = 1;
+      } else if (ErrorFileToStderr) {
+        fd = 2;
       } else {
-        out.print_raw_cr("# Can not save log file, dump to screen..");
-        log.set_fd(defaultStream::output_fd());
-        /* Error reporting currently needs dumpfile.
-         * Maybe implement direct streaming in the future.*/
-        transmit_report_done = true;
+        fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
+        if (fd != -1) {
+          out.print_raw("# An error report file with more information is saved as:\n# ");
+          out.print_raw_cr(buffer);
+
+        } else {
+          out.print_raw_cr("# Can not save log file, dump to screen..");
+          fd = defaultStream::output_fd();
+          /* Error reporting currently needs dumpfile.
+           * Maybe implement direct streaming in the future.*/
+          transmit_report_done = true;
+        }
       }
+      log.set_fd(fd);
     }
 
     staticBufferStream sbs(buffer, O_BUFLEN, &log);
@@ -1034,7 +1046,7 @@
       }
     }
 
-    if (log.fd() != defaultStream::output_fd()) {
+    if (log.fd() > 3) {
       close(log.fd());
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	2021-08-09 15:12:52.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+super public class TestRangeCheckExceptionHandlerLoop
+	version 51:0
+{
+
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+/* This method has an irreducible loop, with 2 entries, one is the exception handler
+
+    static void test(boolean flag, int[] array, Exception exception) throws Exception {
+        int i = 0;
+        if (flag) {
+            try {
+                throw exception;
+            } catch(Exception e) {
+                array[i] = 0;
+                i++;
+            }
+        }
+        if (i < 10) {
+            throw exception; // caught by exception handler above as well
+        }
+    }
+*/
+public static Method test:"(Z[ILjava/lang/Exception;)V"
+	throws java/lang/Exception
+	stack 3 locals 5
+{
+		iconst_0;
+		istore_3;
+		iload_0;
+		ifeq	L17;
+		try t0;
+		aload_2;
+		athrow;
+		endtry t0;
+		catch t0 java/lang/Exception;
+		catch t1 java/lang/Exception;
+		stack_frame_type full;
+		locals_map int, class "[I", class java/lang/Exception, int;
+		stack_map class java/lang/Exception;
+		astore	4;
+		aload_1;
+		iload_3;
+		iconst_0;
+		iastore;
+		iinc	3, 1;
+	L17:	stack_frame_type same;
+		iload_3;
+		bipush	10;
+		if_icmpge	L25;
+		try t1;
+		aload_2;
+		athrow;
+		endtry t1;
+	L25:	stack_frame_type same;
+		return;
+}
+} // end Class TestRangeCheckExceptionHandlerLoop
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	2021-08-09 15:12:52.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8134883
+ * @summary C1's range check elimination breaks with a non-natural loop that an exception handler as one entry
+ * @compile TestRangeCheckExceptionHandlerLoop.jasm
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckExceptionHandlerLoopMain
+ */
+
+public class TestRangeCheckExceptionHandlerLoopMain {
+    public static void main(String[] args) throws Exception {
+        Exception exception = new Exception();
+        int[] array = new int[10];
+        for (int i = 0; i < 20000; i++) {
+            TestRangeCheckExceptionHandlerLoop.test(false, array, exception);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/stringopts/TestStringObjectInitialization.java openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/stringopts/TestStringObjectInitialization.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-08-09 15:12:52.000000000 +0000
@@ -59,6 +59,11 @@
         // Trigger C2's string concatenation optimization
         add(s + Arrays.toString(sArray) + " const ");
     }
+
+    public void reset() {
+        // Reset string to avoid OOMEs
+        myString = "";
+    }
 }
 
 class Runner implements Runnable {
@@ -70,8 +75,9 @@
 
     public void run(){
         String[] array = {"a", "b", "c"};
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100_000; ++i) {
             test.run("a", array);
+            test.reset();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-08-09 15:12:52.000000000 +0000
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031752
  * @summary speculative traps need to be cleaned up at GC
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx512M TestSpecTrapClassUnloading
  *
  */
 
@@ -45,7 +45,7 @@
         MemoryChunk other;
         long[] array;
         MemoryChunk(MemoryChunk other) {
-            other = other;
+            this.other = other;
             array = new long[1024 * 1024 * 1024];
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/arguments/TestAggressiveHeap.java openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/arguments/TestAggressiveHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/arguments/TestAggressiveHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/arguments/TestAggressiveHeap.java	2021-08-09 15:12:52.000000000 +0000
@@ -51,13 +51,18 @@
     // Option requires at least 256M, else error during option processing.
     private static final long minMemory = 256 * 1024 * 1024;
 
+    // Setting the heap to half of the physical memory is not suitable for
+    // a test environment with many tests running concurrently, setting to
+    // half of the required size instead.
+    private static final String heapSizeOption = "-Xmx128M";
+
     // bool UseParallelGC := true {product}
     private static final String parallelGCPattern =
         " *bool +UseParallelGC *:= *true +\\{product\\}";
 
     private static void testFlag() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-            option, "-XX:+PrintFlagsFinal", "-version");
+            option, heapSizeOption, "-XX:+PrintFlagsFinal", "-version");
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/g1/TestHumongousShrinkHeap.java openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/g1/TestHumongousShrinkHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/g1/TestHumongousShrinkHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/g1/TestHumongousShrinkHeap.java	2021-08-09 15:12:52.000000000 +0000
@@ -49,19 +49,29 @@
     private static final int REGION_SIZE = 1024 * 1024; // 1M
     private static final int LISTS_COUNT = 10;
     private static final int HUMON_SIZE = Math.round(.9f * REGION_SIZE);
-    private static final long AVAILABLE_MEMORY
-                              = Runtime.getRuntime().freeMemory();
-    private static final int HUMON_COUNT
-                             = (int) ((AVAILABLE_MEMORY / HUMON_SIZE)
-            / LISTS_COUNT);
 
+    private static final long TOTAL_MEMORY = Runtime.getRuntime().totalMemory();
+    private static final long MAX_MEMORY = Runtime.getRuntime().maxMemory();
+
+    private static final int HUMON_COUNT = (int) ((TOTAL_MEMORY / HUMON_SIZE) / LISTS_COUNT);
 
     public static void main(String[] args) {
-        System.out.format("Running with %s max heap size. "
-                + "Will allocate humongous object of %s size %d times.%n",
-                MemoryUsagePrinter.humanReadableByteCount(AVAILABLE_MEMORY, false),
-                MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
-                HUMON_COUNT
+        if (HUMON_COUNT == 0) {
+            System.out.println("Skipped. Heap is too small");
+            return;
+        }
+
+        if (TOTAL_MEMORY + REGION_SIZE * HUMON_COUNT > MAX_MEMORY) {
+            System.out.println("Skipped. Initial heap size is to close to max heap size.");
+            return;
+        }
+
+        System.out.format("Running with %s initial heap size of %s maximum heap size. "
+                          + "Will allocate humongous object of %s size %d times.%n",
+                          MemoryUsagePrinter.humanReadableByteCount(TOTAL_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(MAX_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
+                          HUMON_COUNT
         );
         new TestHumongousShrinkHeap().test();
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-08-09 15:12:52.000000000 +0000
@@ -96,11 +96,18 @@
                 .getActualMemoryUsage();
 
         test.allocate();
-        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD;
-             i++) {
+        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD; i++) {
             SurvivorAlignmentTestMain.WHITE_BOX.youngGC();
         }
 
+        // Sometimes we see that data unrelated to the test has been allocated during
+        // the loop. This data is included in the expectedMemoryUsage since we look
+        // through all threads to see what they allocated. If this data is still in
+        // the survivor area however, it should not be included in expectedMemoryUsage
+        // since the verification below only look at what's in tenured space.
+        expectedMemoryUsage -= SurvivorAlignmentTestMain.getAlignmentHelper(
+                                   SurvivorAlignmentTestMain.HeapSpace.SURVIVOR)
+                                   .getActualMemoryUsage();
         test.verifyMemoryUsage(expectedMemoryUsage);
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/Makefile openjdk-8-8u312-b07/=unpacked-tar2=/test/Makefile
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/Makefile	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/Makefile	2021-08-09 15:12:52.000000000 +0000
@@ -288,6 +288,9 @@
 # Ignore tests are not run and completely silent about it
 JTREG_IGNORE_OPTION = -ignore:quiet
 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
+# Multiply by 4 the timeout factor
+JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
+JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
 # Add any extra options
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Set other vm and test options
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/8001071/Test8001071.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/8001071/Test8001071.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/8001071/Test8001071.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/8001071/Test8001071.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import sun.misc.Unsafe;
-import java.lang.reflect.Field;
-
-@SuppressWarnings("sunapi")
-public class Test8001071 {
-    public static Unsafe unsafe;
-
-    static {
-        try {
-            Field f = Unsafe.class.getDeclaredField("theUnsafe");
-            f.setAccessible(true);
-            unsafe = (Unsafe) f.get(null);
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String args[]) {
-        unsafe.getObject(new Test8001071(), Short.MAX_VALUE);
-    }
-
-}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/8001071/Test8001071.sh openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/8001071/Test8001071.sh
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/8001071/Test8001071.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/8001071/Test8001071.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-
-## @test
-## @bug 8001071
-## @summary Add simple range check into VM implemenation of Unsafe access methods 
-## @compile Test8001071.java
-## @run shell Test8001071.sh
-## @author filipp.zhinkin@oracle.com
-
-VERSION=`${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>&1`
-
-if [ -n "`echo $VERSION | grep debug`" -o -n "`echo $VERSION | grep jvmg`" ]; then
-        echo "Build type check passed"
-        echo "Continue testing"
-else
-        echo "Fastdebug build is required for this test"
-        exit 0
-fi
-
-${TESTJAVA}/bin/java -cp ${TESTCLASSES} ${TESTVMOPTS} Test8001071 2>&1
-
-HS_ERR_FILE=hs_err_pid*.log
-
-if [ ! -f $HS_ERR_FILE ]
-then
-    echo "hs_err_pid log file was not found"
-    echo "Test failed"
-    exit 1
-fi
-
-grep "assert(byte_offset < p_size) failed: Unsafe access: offset.*> object's size.*" $HS_ERR_FILE
-
-if [ "0" = "$?" ];
-then
-    echo "Range check assertion failed as expected"
-    echo "Test passed"
-    exit 0
-else
-    echo "Range check assertion was not failed"
-    echo "Test failed"
-    exit 1
-fi
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/CompressedOops/CompressedClassPointers.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/CompressedOops/CompressedClassPointers.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-08-09 15:12:52.000000000 +0000
@@ -44,10 +44,10 @@
         output.shouldHaveExitValue(0);
     }
 
-    public static void smallHeapTestWith3G() throws Exception {
+    public static void smallHeapTestWith1G() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "-XX:+UnlockDiagnosticVMOptions",
-            "-XX:CompressedClassSpaceSize=3g",
+            "-XX:CompressedClassSpaceSize=1g",
             "-Xmx128m",
             "-XX:+PrintCompressedOopsMode",
             "-XX:+VerifyBeforeGC", "-version");
@@ -128,7 +128,7 @@
            }
       }
       smallHeapTest();
-      smallHeapTestWith3G();
+      smallHeapTestWith1G();
       largeHeapTest();
       largePagesTest();
       sharingTest();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	2021-08-09 15:12:52.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, SAP. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8220786
+ * @summary Test ErrorFileToStderr and ErrorFileToStdout
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.Platform;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class ErrorFileRedirectTest {
+
+  public static void do_test(boolean redirectStdout, boolean redirectStderr) throws Exception {
+
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-Xmx64M",
+            "-XX:ErrorHandlerTest=12",
+            "-XX:" + (redirectStdout ? "+" : "-") + "ErrorFileToStdout",
+            "-XX:" + (redirectStderr ? "+" : "-") + "ErrorFileToStderr",
+            "-version");
+
+    OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+    // we should have crashed with a SIGSEGV
+    output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+    output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
+
+    // If no redirection happened, we should find a mention of the file in the output.
+    String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);
+    if (redirectStdout == false && redirectStderr == false) {
+      if (hs_err_file == null) {
+        throw new RuntimeException("Expected hs-err file but none found.");
+      } else {
+        System.out.println("Found hs error file mentioned as expected: " + hs_err_file);
+      }
+    } else {
+      if (hs_err_file != null) {
+        throw new RuntimeException("Found unexpected mention of hs-err file (we did redirect the output so no file should have been written).");
+      } else {
+        System.out.println("No mention of an hs-err file - ok! ");
+      }
+    }
+
+    // Check the output. Note that since stderr was specified last it has preference if both are set.
+    if (redirectStdout == true && redirectStderr == false) {
+      output_detail.stdoutShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stderrShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stderr - ok! ");
+    } else if (redirectStderr == true) {
+      output_detail.stderrShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stdoutShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stdout - ok! ");
+    }
+
+    System.out.println("OK.");
+
+  }
+
+  public static void main(String[] args) throws Exception {
+    if (!Platform.isDebugBuild()) {
+      System.out.println("Skip on non-debug builds since we need '-XX:ErrorHandlerTest'");
+      return;
+    }
+    do_test(false, false);
+    do_test(false, true);
+    do_test(true, false);
+    do_test(true, true);
+  }
+
+}
+
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/Metaspace/FragmentMetaspace.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/Metaspace/FragmentMetaspace.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/Metaspace/FragmentMetaspace.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/Metaspace/FragmentMetaspace.java	2021-08-09 15:12:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -25,7 +25,7 @@
  * @test
  * @library /runtime/testlibrary
  * @build GeneratedClassLoader
- * @run main/othervm/timeout=200 FragmentMetaspace
+ * @run main/othervm/timeout=200 -Xmx300m FragmentMetaspace
  */
 
 import java.io.IOException;
@@ -38,25 +38,34 @@
  */
 public class FragmentMetaspace {
 
+    public static Class<?> c;
+
     public static void main(String... args) {
-        runGrowing(Long.valueOf(System.getProperty("time", "80000")));
+        runGrowing(Long.valueOf(System.getProperty("time", "80000")),
+            Integer.valueOf(System.getProperty("iterations", "200")));
         // try to clean up and unload classes to decrease
         // class verification time in debug vm
         System.gc();
     }
 
-    private static void runGrowing(long time) {
+    private static void runGrowing(long time, int iterations) {
         long startTime = System.currentTimeMillis();
-        for (int i = 0; System.currentTimeMillis() < startTime + time; ++i) {
+        for (int i = 0; System.currentTimeMillis() < startTime + time && i < iterations; ++i) {
             try {
                 GeneratedClassLoader gcl = new GeneratedClassLoader();
 
-                Class<?> c = gcl.getGeneratedClasses(i, 100)[0];
+                // getGeneratedClasses throws a RuntimeException in cases where
+                // the javac exit code is not 0. If the original reason for the exception is
+                // a "java.lang.OutOfMemoryError: Java heap space",
+                // increase the heap size in the @run tag and rerun the test.
+                // The heap can be exhausted by this test, but heap exhaustion
+                // is not a failure mode of this test and should be ignored.
+                c = gcl.getGeneratedClasses(i, 100)[0];
                 c.newInstance();
                 c = null;
 
                 gcl = null;
-            } catch (IOException|InstantiationException|IllegalAccessException ex) {
+            } catch (IOException | InstantiationException | IllegalAccessException ex) {
                 throw new RuntimeException(ex);
             }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/StackGap/testme.sh openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/StackGap/testme.sh
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/StackGap/testme.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/StackGap/testme.sh	2021-08-09 15:12:52.000000000 +0000
@@ -49,7 +49,10 @@
     exit 0;
 fi
 
-CFLAGS="-m${VM_BITS}"
+if [ "x${VM_CPU}" != "xaarch64" ];
+then
+    CFLAGS="-m${VM_BITS}"
+fi
 
 LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
@@ -67,7 +70,8 @@
 $gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
-    -ljvm -lpthread exestack-gap.c
+    exestack-gap.c \
+    -ljvm -lpthread
 
 ./stack-gap || exit $?
 ./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/StackTrace/LargeClassTest.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/StackTrace/LargeClassTest.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/StackTrace/LargeClassTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/StackTrace/LargeClassTest.java	2021-08-09 15:12:52.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8194246
+ * @summary JVM crashes on stack trace for large number of methods.
+ * @library /testlibrary
+ * @run main LargeClassTest
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class LargeClassTest implements Opcodes {
+    public static void main(String... args) throws Exception {
+        writeClassFile();
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "-cp", ".",  "Large");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+    }
+
+    // Writes a Large class with > signed 16 bit int methods
+    public static void writeClassFile() throws Exception {
+
+        ClassWriter cw = new ClassWriter(0);
+        FieldVisitor fv;
+        MethodVisitor mv;
+        AnnotationVisitor av0;
+
+        cw.visit(52, ACC_PUBLIC + ACC_SUPER, "Large", null, "java/lang/Object", null);
+
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(1, 1);
+          mv.visitEnd();
+        }
+        {
+          // public static void main(String[] args) {
+          //     Large large = new Large();
+          //     large.f_1(55);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+          mv.visitCode();
+          mv.visitTypeInsn(NEW, "Large");
+          mv.visitInsn(DUP);
+          mv.visitMethodInsn(INVOKESPECIAL, "Large", "<init>", "()V", false);
+          mv.visitVarInsn(ASTORE, 1);
+          mv.visitVarInsn(ALOAD, 1);
+          mv.visitIntInsn(BIPUSH, 55);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_1", "(I)I", false);
+          mv.visitInsn(POP);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+
+        // Write 33560 methods called f_$i
+        for (int i = 1000; i < 34560; i++)
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "f_" + i, "()V", null, null);
+          mv.visitCode();
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(0, 1);
+          mv.visitEnd();
+        }
+        {
+          // public int f_1(int prior) {
+          //   int total = prior + new java.util.Random(1).nextInt();
+          //   return total + f_2(total);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_1", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ILOAD, 1);
+          mv.visitTypeInsn(NEW, "java/util/Random");
+          mv.visitInsn(DUP);
+          mv.visitInsn(LCONST_1);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/util/Random", "<init>", "(J)V", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/Random", "nextInt", "()I", false);
+          mv.visitInsn(IADD);
+          mv.visitVarInsn(ISTORE, 2);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_2", "(I)I", false);
+          mv.visitInsn(IADD);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(5, 3);
+          mv.visitEnd();
+        }
+        {
+          // public int f_2(int total) {
+          //   System.out.println(java.util.Arrays.toString(Thread.currentThread().getStackTrace()));
+          //   return 10;
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_2", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+          mv.visitMethodInsn(INVOKESTATIC, "java/lang/Thread", "currentThread", "()Ljava/lang/Thread;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Thread", "getStackTrace", "()[Ljava/lang/StackTraceElement;", false);
+          mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "toString", "([Ljava/lang/Object;)Ljava/lang/String;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+          mv.visitIntInsn(BIPUSH, 10);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+        cw.visitEnd();
+
+        try (FileOutputStream fos = new FileOutputStream(new File("Large.class"))) {
+          fos.write(cw.toByteArray());
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/Unsafe/RangeCheck.java openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/Unsafe/RangeCheck.java
--- openjdk-8-8u292-b10/=unpacked-tar2=/test/runtime/Unsafe/RangeCheck.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/test/runtime/Unsafe/RangeCheck.java	2021-08-09 15:12:52.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8001071
+ * @summary Add simple range check into VM implemenation of Unsafe access methods
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+import sun.misc.Unsafe;
+
+public class RangeCheck {
+
+    public static void main(String args[]) throws Exception {
+        if (!Platform.isDebugBuild()) {
+            System.out.println("Testing assert which requires a debug build. Passing silently.");
+            return;
+        }
+
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                true,
+                "-Xmx32m",
+                "-XX:-TransmitErrorReport",
+                DummyClassWithMainRangeCheck.class.getName());
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldMatch("assert\\(byte_offset < p_size\\) failed: Unsafe access: offset \\d+ > object's size \\d+");
+    }
+
+    public static class DummyClassWithMainRangeCheck {
+        public static void main(String args[]) throws Exception {
+            Unsafe unsafe = Utils.getUnsafe();
+            unsafe.getObject(new DummyClassWithMainRangeCheck(), Short.MAX_VALUE);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar2=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar2=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar2=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar2=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar3=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar3=/.hg_archival.txt	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/.hg_archival.txt	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 37a05a11f281b4d238e2f9e7ebb67c63f64d0e77
-node: 4eae74c62a511317a50759f5faad3e748d34be95
+node: 132377e2edb21c55beb9dee2806e27979363977e
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/.hgtags openjdk-8-8u312-b07/=unpacked-tar3=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar3=/.hgtags	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/.hgtags	2021-09-01 14:33:15.000000000 +0000
@@ -1081,3 +1081,22 @@
 99b8202e7f718c01393f373609615a9c2721abe3 jdk8u292-b07
 d103481ecd91690051bbd06e4eb4d3f3b4938dfc jdk8u292-b08
 364cf530fbd346293f4fe51e725b1b3a807fd30f jdk8u292-b09
+4eae74c62a511317a50759f5faad3e748d34be95 jdk8u292-b10
+4eae74c62a511317a50759f5faad3e748d34be95 jdk8u292-ga
+7c8bbbfe6acbe08eadae04e1ec46d94e9f98b743 jdk8u302-b00
+73584fe56769e5aefc6ecb752a4df786c03d6780 jdk8u302-b01
+04fb823d2094591cc63418967b8cfcc1b23dc516 jdk8u302-b02
+0056610eefad4cffedcc1443efdff8145d2a0135 jdk8u302-b03
+6a07e2cb5bdb7a4983ee89e7ed715435c722d9b3 jdk8u302-b04
+d727e88aa12a29c4a217d774d72cbfeb48648f09 jdk8u302-b05
+d727e88aa12a29c4a217d774d72cbfeb48648f09 jdk8u312-b00
+80412c5440236d4cd3f671690dd4d4d46c12e691 jdk8u302-b06
+7762468ad65060d9445413975cd7142f89792bbd jdk8u302-b07
+06b4012edc724ba45b1c1a8593d00ca989baa284 jdk8u302-b08
+06b4012edc724ba45b1c1a8593d00ca989baa284 jdk8u302-ga
+52d602b87c1d0ff8325e2e8b58fcdca1d8c302a5 jdk8u312-b01
+cc5ddc374b2432b666120e5140dfc70b891a626a jdk8u312-b02
+61729ad5f50ea3875c9774cb7610f3b725f12670 jdk8u312-b03
+40bb77912d3f411365573c280c43c257a44948a9 jdk8u312-b04
+991bbb9501e2b295a17e1072292df75c5e814836 jdk8u312-b05
+ece88aba26eb66ce321e0da344ce2bb148ec9d1e jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/CompileLaunchers.gmk openjdk-8-8u312-b07/=unpacked-tar3=/make/CompileLaunchers.gmk
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/CompileLaunchers.gmk	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/CompileLaunchers.gmk	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -556,7 +556,9 @@
 	$(call install-file)
 
 $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(DEBUGINFO_EXT): $(BUILD_UNPACKEXE)
-	$(call install-file)
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) -R $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR)/unpack200$(DEBUGINFO_EXT) $@
 
 BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/soneraclass2ca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/soneraclass2ca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/soneraclass2ca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/soneraclass2ca	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Owner: CN=Sonera Class2 CA, O=Sonera, C=FI
-Issuer: CN=Sonera Class2 CA, O=Sonera, C=FI
-Serial number: 1d
-Valid from: Fri Apr 06 07:29:40 GMT 2001 until: Tue Apr 06 07:29:40 GMT 2021
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 2048-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/thawtepremiumserverca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/thawtepremiumserverca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/thawtepremiumserverca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/thawtepremiumserverca	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-Owner: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-Issuer: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-Serial number: 36122296c5e338a520a1d25f4cd70954
-Valid from: Thu Aug 01 00:00:00 GMT 1996 until: Fri Jan 01 23:59:59 GMT 2021
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 1024-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
-zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
-d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
-cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
-gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
-CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
-BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
-YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
-ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
-aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
-ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
-+ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
-BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
-CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
-IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
-WuFg3GQjPEIuTQ==
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass2g2ca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass2g2ca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass2g2ca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass2g2ca	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
-Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
-Serial number: b92f60cc889fa17a4609b85b706c8aaf
-Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 1024-bit RSA key
-Version: 1
------BEGIN CERTIFICATE-----
-MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
-YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
-Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
-IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
-KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
-HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
-DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
-AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
-nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
-rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
-jBJ7xUS0rg==
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass3ca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass3ca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass3ca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass3ca	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Owner: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
-Issuer: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
-Serial number: 3c9131cb1ff6d01b0e9ab8d044bf12be
-Valid from: Mon Jan 29 00:00:00 GMT 1996 until: Wed Aug 02 23:59:59 GMT 2028
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 1024-bit RSA key
-Version: 1
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
-2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
-2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass3g2ca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass3g2ca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisignclass3g2ca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisignclass3g2ca	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
-Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
-Serial number: 7dd9fe07cfa81eb7107967fba78934c6
-Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 1024-bit RSA key
-Version: 1
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
-pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
-13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
-U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
-F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
-oJ2daZH9
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisigntsaca openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisigntsaca
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/data/cacerts/verisigntsaca	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/data/cacerts/verisigntsaca	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Owner: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
-Issuer: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
-Serial number: 67c8e1e8e3be1cbdfc913b8ea6238749
-Valid from: Wed Jan 01 00:00:00 GMT 1997 until: Fri Jan 01 23:59:59 GMT 2021
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 1024-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIICsDCCAhmgAwIBAgIQZ8jh6OO+HL38kTuOpiOHSTANBgkqhkiG9w0BAQUFADCB
-izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxML
-RHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENl
-cnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcN
-OTcwMTAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTAT
-BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV
-BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNV
-BAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u
-6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522
-FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAS+mqF4EF+3kKMZ/F
-QfRWVKvpwuWXjhj+kckMPiZkyaFMJ2SnvQGTVXFuF0853BvcSTUQOSP/ypvIz2Y/
-3Ewa1IEGQlIf4SaxFhe65nByMUToTo1b5NP50OOPJWQx5yr4GIg2GlLFDUE1G2m3
-JvUXzMEZXkt8XOKDgJH6L/uatxY=
------END CERTIFICATE-----
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/Images.gmk openjdk-8-8u312-b07/=unpacked-tar3=/make/Images.gmk
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/Images.gmk	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/Images.gmk	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -139,7 +139,7 @@
       clhsdb$(EXE_SUFFIX) \
       hsdb$(EXE_SUFFIX) \
       jfr$(EXE_SUFFIX)
-  NOT_JRE_DEBUGINFO_FILES := $(patsubst %$(EXE_SUFFIX),%$(DEBUGINFO_EXT),$(NOT_JRE_BIN_FILES))
+  NOT_JRE_BIN_DEBUGINFO_FILES := $(patsubst %$(EXE_SUFFIX),%$(DEBUGINFO_EXT),$(NOT_JRE_BIN_FILES))
 endif
 
 WINDOWS_JDK_BIN_FILES = \
@@ -157,17 +157,8 @@
 # Prevent sjavac from entering the images.
 ALL_BIN_LIST := $(filter-out %/sjavac, $(ALL_BIN_LIST))
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  # On windows, the libraries are in the bin dir, only filter out debuginfo files
-  # for executables. "java" is both a library and executable.
-  ALL_BIN_EXEC_FILES := $(filter-out java.exe, $(notdir $(filter %.exe, $(ALL_BIN_LIST))))
-  ALL_BIN_DEBUG_FILTER := $(addprefix %, $(patsubst %.exe, %.debuginfo, $(ALL_BIN_EXEC_FILES)) \
-      $(patsubst %.exe, %.diz, $(ALL_BIN_EXEC_FILES))) %.pdb
-  ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER), $(ALL_BIN_LIST))
-endif
-
-JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
-JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)) $(addprefix %, $(NOT_JRE_DEBUGINFO_FILES)), $(JDKJRE_BIN_LIST))
+JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)) $(addprefix %, $(NOT_JRE_BIN_DEBUGINFO_FILES)), $(ALL_BIN_LIST))
+JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   JDK_BIN_LIST := $(filter $(addprefix %, $(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/CoreLibraries.gmk openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/CoreLibraries.gmk
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/CoreLibraries.gmk	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/CoreLibraries.gmk	2021-09-01 14:33:15.000000000 +0000
@@ -409,6 +409,7 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+  LIBJLI_CFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
 endif
 
 ifneq ($(USE_EXTERNAL_LIBZ), true)
@@ -442,7 +443,7 @@
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
     LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
-    LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
+    LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices -mmacosx-version-min=$(MACOSX_VERSION_MIN), \
     LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
     LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
     LDFLAGS_SUFFIX_aix := $(LIBZ) $(LIBDL),\
@@ -503,7 +504,7 @@
       LANG := C, \
       OPTIMIZATION := HIGH, \
       CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
-      LDFLAGS := -nostdlib -r, \
+      LDFLAGS := -nostdlib -r -mmacosx-version-min=$(MACOSX_VERSION_MIN), \
       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/SecurityLibraries.gmk openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/SecurityLibraries.gmk
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/SecurityLibraries.gmk	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/SecurityLibraries.gmk	2021-09-01 14:33:15.000000000 +0000
@@ -133,6 +133,8 @@
   endif
 
   ifneq ($(BUILD_LIBKRB5_NAME), )
+    # libosxkrb5 needs to call deprecated krb5 APIs so that java
+    # can use the native credentials cache.
     $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
         LIBRARY := $(BUILD_LIBKRB5_NAME), \
         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/ServiceabilityLibraries.gmk openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/ServiceabilityLibraries.gmk
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/lib/ServiceabilityLibraries.gmk	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/lib/ServiceabilityLibraries.gmk	2021-09-01 14:33:15.000000000 +0000
@@ -53,7 +53,7 @@
     EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS), \
     CFLAGS_windows := /Gy, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
@@ -83,7 +83,7 @@
         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \
         -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
         -I$(JDK_TOPDIR)/src/share/transport/socket \
         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
@@ -119,7 +119,7 @@
           $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
       LANG := C, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+      CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \
           -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
           -I$(JDK_TOPDIR)/src/share/transport/shmem \
           -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
@@ -148,7 +148,7 @@
     SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DJDWP_LOGGING \
         -I$(JDK_TOPDIR)/src/share/transport/export \
         -I$(JDK_TOPDIR)/src/share/back/export \
         -I$(JDK_TOPDIR)/src/share/npt \
@@ -183,7 +183,7 @@
         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
         -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsdt/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -252,7 +252,7 @@
     INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
+    CFLAGS := $(LIBINSTRUMENT_CFLAGS) $(CFLAGS_WARNINGS_ARE_ERRORS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
@@ -327,7 +327,7 @@
     EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
     LANG := C, \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
-    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \
     MAPFILE := $(LIBMANAGEMENT_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -375,7 +375,7 @@
     SRC := $(BUILD_LIBHPROF_SRC), \
     LANG := C, \
     OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
-    CFLAGS := $(CFLAGS_JDKLIB) \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
         $(BUILD_LIBHPROF_CFLAGS), \
     CFLAGS_debug := -DHPROF_LOGGING, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \
@@ -403,7 +403,7 @@
     SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
     LANG := C, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
         -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava_crw_demo/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -430,7 +430,7 @@
         SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
         LANG := C, \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
+        CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
             -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjfr/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libawt/mapfile-mawt-vers openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libawt/mapfile-mawt-vers
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libawt/mapfile-mawt-vers	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libawt/mapfile-mawt-vers	2021-09-01 14:33:15.000000000 +0000
@@ -196,7 +196,6 @@
                 Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
                 Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
                 Java_sun_java2d_opengl_GLXSurfaceData_initOps;
-                Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer;
 
                 Java_sun_print_CUPSPrinter_initIDs;
                 Java_sun_print_CUPSPrinter_getCupsServer;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libawt_xawt/mapfile-vers openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libawt_xawt/mapfile-vers
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libawt_xawt/mapfile-vers	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libawt_xawt/mapfile-vers	2021-09-01 14:33:15.000000000 +0000
@@ -338,7 +338,6 @@
         Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
         Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
         Java_sun_java2d_opengl_GLXSurfaceData_initOps;
-        Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer;
 
         Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
         Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libmanagement/mapfile-vers openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libmanagement/mapfile-vers
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libmanagement/mapfile-vers	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libmanagement/mapfile-vers	2021-09-01 14:33:15.000000000 +0000
@@ -27,19 +27,21 @@
 
 SUNWprivate_1.1 {
 	global:
-	    Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize;
+	    Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0;
 	    Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize0;
 	    Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize0;
-	    Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount;
-	    Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount;
-	    Java_sun_management_OperatingSystemImpl_getProcessCpuLoad;
-	    Java_sun_management_OperatingSystemImpl_getProcessCpuTime;
+	    Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount0;
+	    Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount0;
+	    Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0;
+	    Java_sun_management_OperatingSystemImpl_getProcessCpuTime0;
 	    Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0;
 	    Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize0;
 	    Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize0;
 	    Java_sun_management_OperatingSystemImpl_getSingleCpuLoad0;
 	    Java_sun_management_OperatingSystemImpl_getHostConfiguredCpuCount0;
-	    Java_sun_management_OperatingSystemImpl_initialize;
+	    Java_sun_management_OperatingSystemImpl_getHostOnlineCpuCount0;
+	    Java_sun_management_OperatingSystemImpl_getHostTotalCpuTicks0;
+	    Java_sun_management_OperatingSystemImpl_initialize0;
 	    Java_sun_management_ClassLoadingImpl_setVerboseClass;
             Java_sun_management_DiagnosticCommandImpl_executeDiagnosticCommand;
             Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommands;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/mapfile-vers openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/mapfile-vers
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/mapfile-vers	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/mapfile-vers	2021-09-01 14:33:15.000000000 +0000
@@ -66,6 +66,7 @@
 		Java_java_util_zip_ZipFile_open;
 		Java_java_util_zip_ZipFile_read;
 		Java_java_util_zip_ZipFile_startsWithLOC;
+		Java_java_util_zip_ZipFile_getManifestNum;
 
 		ZIP_Close;
 		ZIP_CRC32;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparc openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparc
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparc	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparc	2021-09-01 14:33:15.000000000 +0000
@@ -19,6 +19,7 @@
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
 text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
+text: .text%Java_java_util_zip_ZipFile_getManifestNum;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparcv9 openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparcv9
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparcv9	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-sparcv9	2021-09-01 14:33:15.000000000 +0000
@@ -19,6 +19,7 @@
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
 text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
+text: .text%Java_java_util_zip_ZipFile_getManifestNum;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-x86 openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-x86
--- openjdk-8-8u292-b10/=unpacked-tar3=/make/mapfiles/libzip/reorder-x86	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/make/mapfiles/libzip/reorder-x86	2021-09-01 14:33:15.000000000 +0000
@@ -20,6 +20,7 @@
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
 text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
+text: .text%Java_java_util_zip_ZipFile_getManifestNum;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java openjdk-8-8u312-b07/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java	2021-09-01 14:33:15.000000000 +0000
@@ -116,7 +116,10 @@
         try (Stream<String> lines =
              readFilePrivileged(Paths.get("/proc/self/cgroup"))) {
 
-            lines.map(line -> line.split(":"))
+            // The limit value of 3 is because /proc/self/cgroup contains three
+            // colon-separated tokens per line. The last token, cgroup path, might
+            // contain a ':'.
+            lines.map(line -> line.split(":", 3))
                  .filter(line -> (line.length >= 3))
                  .forEach(line -> setSubSystemPath(metrics, line));
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java openjdk-8-8u312-b07/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java	2021-09-01 14:33:15.000000000 +0000
@@ -27,6 +27,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -156,7 +157,18 @@
     public static long convertStringToLong(String strval) {
         if (strval == null) return 0L;
 
-        long retval = Long.parseLong(strval);
+        long retval = 0;
+
+        try {
+            retval = Long.parseLong(strval);
+        } catch (NumberFormatException e) {
+            // For some properties (e.g. memory.limit_in_bytes) we may overflow the range of signed long.
+            // In this case, return Long.max
+            BigInteger b = new BigInteger(strval);
+            if (b.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
+                return Long.MAX_VALUE;
+            }
+        }
 
         return retval;
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -379,23 +379,11 @@
     public VolatileImage createCompatibleVolatileImage(int width, int height,
                                                        int transparency,
                                                        int type) {
-        if (type == FLIP_BACKBUFFER || type == WINDOW || type == UNDEFINED ||
-            transparency == Transparency.BITMASK)
-        {
+        if ((type != FBOBJECT && type != TEXTURE)
+                || transparency == Transparency.BITMASK
+                || type == FBOBJECT && !isCapPresent(CAPS_EXT_FBOBJECT)) {
             return null;
         }
-
-        if (type == FBOBJECT) {
-            if (!isCapPresent(CAPS_EXT_FBOBJECT)) {
-                return null;
-            }
-        } else if (type == PBUFFER) {
-            boolean isOpaque = transparency == Transparency.OPAQUE;
-            if (!isOpaque && !isCapPresent(CAPS_STORED_ALPHA)) {
-                return null;
-            }
-        }
-
         SunVolatileImage vi = new AccelTypedVolatileImage(this, width, height,
                                                           transparency, type);
         Surface sd = vi.getDestSurface();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java	2021-09-01 14:33:15.000000000 +0000
@@ -52,9 +52,6 @@
                                 long pPeerData, long layerPtr, int xoff,
                                 int yoff, boolean isOpaque);
 
-    protected native boolean initPbuffer(long pData, long pConfigInfo,
-            boolean isOpaque, int width, int height);
-
     protected CGLSurfaceData(CGLGraphicsConfig gc, ColorModel cm, int type,
                              int width, int height) {
         super(gc, cm, type);
@@ -140,7 +137,7 @@
 
     /**
      * Creates a SurfaceData object representing an off-screen buffer (either a
-     * Pbuffer or Texture).
+     * FBO or Texture).
      */
     public static CGLOffScreenSurfaceData createData(CGLGraphicsConfig gc,
             int width, int height, ColorModel cm, Image image, int type) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -44,7 +44,7 @@
 
 public class CGLVolatileSurfaceManager extends VolatileSurfaceManager {
 
-    private boolean accelerationEnabled;
+    private final boolean accelerationEnabled;
 
     public CGLVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
         super(vImg, context);
@@ -52,18 +52,13 @@
         /*
          * We will attempt to accelerate this image only under the
          * following conditions:
-         *   - the image is opaque OR
-         *   - the image is translucent AND
-         *       - the GraphicsConfig supports the FBO extension OR
-         *       - the GraphicsConfig has a stored alpha channel
+         *   - the image is not bitmask AND the GraphicsConfig supports the FBO
+         *     extension
          */
         int transparency = vImg.getTransparency();
-        CGLGraphicsConfig gc = (CGLGraphicsConfig)vImg.getGraphicsConfig();
-        accelerationEnabled =
-            (transparency == Transparency.OPAQUE) ||
-            ((transparency == Transparency.TRANSLUCENT) &&
-             (gc.isCapPresent(CAPS_EXT_FBOBJECT) ||
-              gc.isCapPresent(CAPS_STORED_ALPHA)));
+        CGLGraphicsConfig gc = (CGLGraphicsConfig) vImg.getGraphicsConfig();
+        accelerationEnabled = gc.isCapPresent(CAPS_EXT_FBOBJECT)
+                && transparency != Transparency.BITMASK;
     }
 
     protected boolean isAccelerationEnabled() {
@@ -71,7 +66,7 @@
     }
 
     /**
-     * Create a pbuffer-based SurfaceData object (or init the backbuffer
+     * Create a FBO-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig)
      */
     protected SurfaceData initAcceleratedSurface() {
@@ -111,10 +106,9 @@
                 ColorModel cm = gc.getColorModel(vImg.getTransparency());
                 int type = vImg.getForcedAccelSurfaceType();
                 // if acceleration type is forced (type != UNDEFINED) then
-                // use the forced type, otherwise choose one based on caps
+                // use the forced type, otherwise choose FBOBJECT
                 if (type == OGLSurfaceData.UNDEFINED) {
-                    type = gc.isCapPresent(CAPS_EXT_FBOBJECT) ?
-                        OGLSurfaceData.FBOBJECT : OGLSurfaceData.PBUFFER;
+                    type = OGLSurfaceData.FBOBJECT;
                 }
                 if (createVSynced) {
                     // TODO: modify parameter to delegate
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m	2021-09-01 14:33:15.000000000 +0000
@@ -26,6 +26,7 @@
 #import "AppleScriptExecutionContext.h"
 
 #import <Carbon/Carbon.h>
+#import <pthread.h>
 
 #import "AS_NS_ConversionUtils.h"
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/awt/AWTWindow.m openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/awt/AWTWindow.m
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/awt/AWTWindow.m	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/awt/AWTWindow.m	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, 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
@@ -1037,7 +1037,8 @@
                     screenContentRect.origin.y - frame.origin.y,
                     screenContentRect.size.width,
                     screenContentRect.size.height);
-                nsWindow.contentView.frame = contentFrame;
+                NSView* view = (NSView*)nsWindow.contentView;
+                view.frame = contentFrame;
                 resized = YES;
             }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -63,7 +63,7 @@
 
         CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo;
         if (ctxinfo != NULL) {
-            NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];        
+            NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
             [NSOpenGLContext clearCurrentContext];
             [ctxinfo->context clearDrawable];
             [ctxinfo->context release];
@@ -339,18 +339,10 @@
     if (value != 0) {
         caps |= CAPS_DOUBLEBUFFERED;
     }
-    [sharedPixelFormat
-        getValues: &value
-        forAttribute: NSOpenGLPFAAlphaSize
-        forVirtualScreen: contextVirtualScreen];
-    if (value != 0) {
-        caps |= CAPS_STORED_ALPHA;
-    }
 
-    J2dRlsTraceLn2(J2D_TRACE_INFO,
-                   "CGLGraphicsConfig_getCGLConfigInfo: db=%d alpha=%d",
-                   (caps & CAPS_DOUBLEBUFFERED) != 0,
-                   (caps & CAPS_STORED_ALPHA) != 0);
+    J2dRlsTraceLn1(J2D_TRACE_INFO,
+                   "CGLGraphicsConfig_getCGLConfigInfo: db=%d",
+                   (caps & CAPS_DOUBLEBUFFERED) != 0);
 
     // remove before shipping (?)
 #if 1
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -39,7 +39,6 @@
     AWTView               *peerData;
     CGLLayer              *layer;
     GLclampf              argb[4]; // background clear color
-    NSOpenGLPixelBuffer   *pbuffer;
     CGLGraphicsConfigInfo *configInfo;
 } CGLSDOps;
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -109,9 +109,7 @@
 
 /**
  * This function disposes of any native windowing system resources associated
- * with this surface.  For instance, if the given OGLSDOps is of type
- * OGLSD_PBUFFER, this method implementation will destroy the actual pbuffer
- * surface.
+ * with this surface.
  */
 void
 OGLSD_DestroyOGLSurface(JNIEnv *env, OGLSDOps *oglsdo)
@@ -121,16 +119,7 @@
 JNF_COCOA_ENTER(env);
 
     CGLSDOps *cglsdo = (CGLSDOps *)oglsdo->privOps;
-    if (oglsdo->drawableType == OGLSD_PBUFFER) {
-        if (oglsdo->textureID != 0) {
-            j2d_glDeleteTextures(1, &oglsdo->textureID);
-            oglsdo->textureID = 0;
-        }
-        if (cglsdo->pbuffer != NULL) {
-            [cglsdo->pbuffer release];
-            cglsdo->pbuffer = NULL;
-        }
-    } else if (oglsdo->drawableType == OGLSD_WINDOW) {
+    if (oglsdo->drawableType == OGLSD_WINDOW) {
         // detach the NSView from the NSOpenGLContext
         CGLGraphicsConfigInfo *cglInfo = cglsdo->configInfo;
         OGLContext *oglc = cglInfo->context;
@@ -251,23 +240,12 @@
 
 JNF_COCOA_ENTER(env);
 
-    // set the current surface
-    if (dstOps->drawableType == OGLSD_PBUFFER) {
-        // REMIND: pbuffers are not fully tested yet...
-        [ctxinfo->context clearDrawable];
+    CGLSDOps *cglsdo = (CGLSDOps *)dstOps->privOps;
+    NSView *nsView = (NSView *)cglsdo->peerData;
+
+    if ([ctxinfo->context view] != nsView) {
         [ctxinfo->context makeCurrentContext];
-        [ctxinfo->context setPixelBuffer: dstCGLOps->pbuffer
-                cubeMapFace: 0
-                mipMapLevel: 0
-                currentVirtualScreen: [ctxinfo->context currentVirtualScreen]];
-    } else {
-        CGLSDOps *cglsdo = (CGLSDOps *)dstOps->privOps;
-        NSView *nsView = (NSView *)cglsdo->peerData;
-
-        if ([ctxinfo->context view] != nsView) {
-            [ctxinfo->context makeCurrentContext];
-            [ctxinfo->context setView: nsView];
-        }
+        [ctxinfo->context setView: nsView];
     }
 
     if (OGLC_IS_CAP_PRESENT(oglc, CAPS_EXT_FBOBJECT)) {
@@ -277,16 +255,6 @@
         j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
 
-    if ((srcOps != dstOps) && (srcOps->drawableType == OGLSD_PBUFFER)) {
-        // bind pbuffer to the render texture object (since we are preparing
-        // to copy from the pbuffer)
-        CGLSDOps *srcCGLOps = (CGLSDOps *)srcOps->privOps;
-        j2d_glBindTexture(GL_TEXTURE_2D, srcOps->textureID);
-        [ctxinfo->context
-                setTextureImageToPixelBuffer: srcCGLOps->pbuffer
-                colorBuffer: GL_FRONT];
-    }
-
 JNF_COCOA_EXIT(env);
 
     return oglc;
@@ -452,105 +420,6 @@
     cglsdo->layer = NULL;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_sun_java2d_opengl_CGLSurfaceData_initPbuffer
-    (JNIEnv *env, jobject cglsd,
-     jlong pData, jlong pConfigInfo, jboolean isOpaque,
-     jint width, jint height)
-{
-    J2dTraceLn3(J2D_TRACE_INFO, "CGLSurfaceData_initPbuffer: w=%d h=%d opq=%d", width, height, isOpaque);
-
-    OGLSDOps *oglsdo = (OGLSDOps *)jlong_to_ptr(pData);
-    if (oglsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: ops are null");
-        return JNI_FALSE;
-    }
-
-    CGLSDOps *cglsdo = (CGLSDOps *)oglsdo->privOps;
-    if (cglsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: cgl ops are null");
-        return JNI_FALSE;
-    }
-
-    CGLGraphicsConfigInfo *cglInfo = (CGLGraphicsConfigInfo *)
-        jlong_to_ptr(pConfigInfo);
-    if (cglInfo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: cgl config info is null");
-        return JNI_FALSE;
-    }
-
-    // find the maximum allowable texture dimensions (this value ultimately
-    // determines our maximum pbuffer size)
-    int pbMax = 0;
-    j2d_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &pbMax);
-
-    int pbWidth = 0;
-    int pbHeight = 0;
-    if (OGLC_IS_CAP_PRESENT(cglInfo->context, CAPS_TEXNONPOW2)) {
-        // use non-power-of-two dimensions directly
-        pbWidth = (width <= pbMax) ? width : 0;
-        pbHeight = (height <= pbMax) ? height : 0;
-    } else {
-        // find the appropriate power-of-two dimensions
-        pbWidth = OGLSD_NextPowerOfTwo(width, pbMax);
-        pbHeight = OGLSD_NextPowerOfTwo(height, pbMax);
-    }
-
-    J2dTraceLn3(J2D_TRACE_VERBOSE, "  desired pbuffer dimensions: w=%d h=%d max=%d", pbWidth, pbHeight, pbMax);
-
-    // if either dimension is 0, we cannot allocate a pbuffer/texture with the
-    // requested dimensions
-    if (pbWidth == 0 || pbHeight == 0) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: dimensions too large");
-        return JNI_FALSE;
-    }
-
-    int format = isOpaque ? GL_RGB : GL_RGBA;
-
-JNF_COCOA_ENTER(env);
-
-    cglsdo->pbuffer =
-        [[NSOpenGLPixelBuffer alloc]
-            initWithTextureTarget: GL_TEXTURE_2D
-            textureInternalFormat: format
-            textureMaxMipMapLevel: 0
-            pixelsWide: pbWidth
-            pixelsHigh: pbHeight];
-    if (cglsdo->pbuffer == nil) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: could not create pbuffer");
-        return JNI_FALSE;
-    }
-
-    // make sure the actual dimensions match those that we requested
-    GLsizei actualWidth  = [cglsdo->pbuffer pixelsWide];
-    GLsizei actualHeight = [cglsdo->pbuffer pixelsHigh];
-    if (actualWidth != pbWidth || actualHeight != pbHeight) {
-        J2dRlsTraceLn2(J2D_TRACE_ERROR, "CGLSurfaceData_initPbuffer: actual (w=%d h=%d) != requested", actualWidth, actualHeight);
-        [cglsdo->pbuffer release];
-        return JNI_FALSE;
-    }
-
-    GLuint texID = 0;
-    j2d_glGenTextures(1, &texID);
-    j2d_glBindTexture(GL_TEXTURE_2D, texID);
-
-    oglsdo->drawableType = OGLSD_PBUFFER;
-    oglsdo->isOpaque = isOpaque;
-    oglsdo->width = width;
-    oglsdo->height = height;
-    oglsdo->textureID = texID;
-    oglsdo->textureWidth = pbWidth;
-    oglsdo->textureHeight = pbHeight;
-    oglsdo->activeBuffer = GL_FRONT;
-    oglsdo->needsInit = JNI_TRUE;
-
-    OGLSD_INIT_TEXTURE_FILTER(oglsdo, GL_NEAREST);
-
-JNF_COCOA_EXIT(env);
-
-    return JNI_TRUE;
-}
-
 #pragma mark -
 #pragma mark "--- CGLSurfaceData methods - Mac OS X specific ---"
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.h openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.h	2021-09-01 14:33:15.000000000 +0000
@@ -26,7 +26,7 @@
 #ifndef __THREADUTILITIES_H
 #define __THREADUTILITIES_H
 
-#import <pthread.h>
+#include <pthread.h>
 
 #import "AWT_debug.h"
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.m openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.m
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.m	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/macosx/native/sun/osxapp/ThreadUtilities.m	2021-09-01 14:33:15.000000000 +0000
@@ -36,7 +36,7 @@
 static jobject appkitThreadGroup = NULL;
 static BOOL awtEmbedded = NO;
 
-inline void attachCurrentThread(void** env) {
+static inline void attachCurrentThread(void** env) {
     if ([NSThread isMainThread]) {
         JavaVMAttachArgs args;
         args.version = JNI_VERSION_1_4;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/eventHandler.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/eventHandler.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/eventHandler.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/eventHandler.c	2021-09-01 14:33:15.000000000 +0000
@@ -1685,7 +1685,7 @@
 eventHandler_createPermanentInternal(EventIndex ei, HandlerFunction func)
 {
     return createInternal(ei, func, NULL,
-                          NULL, NULL, (jlocation)NULL, JNI_TRUE);
+                          NULL, NULL, 0, JNI_TRUE);
 }
 
 HandlerNode *
@@ -1694,7 +1694,7 @@
                                       jthread thread)
 {
     return createInternal(ei, func, thread,
-                          NULL, NULL, (jlocation)NULL, JNI_FALSE);
+                          NULL, NULL, 0, JNI_FALSE);
 }
 
 HandlerNode *
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/log_messages.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/log_messages.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/log_messages.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/log_messages.c	2021-09-01 14:33:15.000000000 +0000
@@ -56,17 +56,24 @@
 static void
 get_time_stamp(char *tbuf, size_t ltbuf)
 {
-    char format[MAXLEN_TIMESTAMP+1];
+    char timestamp_prefix[MAXLEN_TIMESTAMP+1];
+    char timestamp_postfix[MAXLEN_TIMESTAMP+1];
     unsigned millisecs = 0;
     time_t t = 0;
 
     GETMILLSECS(millisecs);
-    if ( time(&t) == (time_t)(-1) )
+    if ( time(&t) == (time_t)(-1) ) {
         t = 0;
-    (void)strftime(format, sizeof(format),
-                /* Break this string up for SCCS's sake */
-                "%" "d.%" "m.%" "Y %" "T.%%.3d %" "Z", localtime(&t));
-    (void)snprintf(tbuf, ltbuf, format, (int)(millisecs));
+    }
+    /* Break this up so that the format strings are string literals
+       and we avoid a compiler warning. */
+    (void)strftime(timestamp_prefix, sizeof(timestamp_prefix),
+                "%d.%m.%Y %T", localtime(&t));
+    (void)strftime(timestamp_postfix, sizeof(timestamp_postfix),
+                "%Z", localtime(&t));
+    (void)snprintf(tbuf, ltbuf,
+                   "%s.%.3d %s", timestamp_prefix,
+                   (int)(millisecs), timestamp_postfix);
 }
 
 /* Get basename of filename */
@@ -175,7 +182,7 @@
                         "LOC=%s;PID=%d;THR=t@%d",
                         location_stamp,
                         (int)processPid,
-                        (int)tid);
+                        (int)(intptr_t)tid);
 
             /* Construct message string. */
             va_start(ap, format);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/SDE.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/SDE.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/back/SDE.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/back/SDE.c	2021-09-01 14:33:15.000000000 +0000
@@ -48,8 +48,6 @@
 #define BASE_STRATUM_NAME "Java"
 
 #define null NULL
-#define true JNI_TRUE
-#define false JNI_FALSE
 #define String char *
 #define private static
 
@@ -147,7 +145,7 @@
             defaultStratumId = null;
             defaultStratumIndex = -1;
             baseStratumIndex = -2; /* so as not to match -1 above */
-            sourceMapIsValid = false;
+            sourceMapIsValid = JNI_FALSE;
 
             if (getSourceDebugExtension(clazz, &sourceDebugExtension) ==
                 JVMTI_ERROR_NONE) {
@@ -667,7 +665,7 @@
         jplsFilename = readLine();
         defaultStratumId = readLine();
         createJavaStratum();
-        while (true) {
+        while (1) {
             if (sdeRead() != '*') {
                 syntax("expected '*'");
             }
@@ -684,7 +682,7 @@
                 case 'E':
                     /* set end points */
                     storeStratum("*terminator*");
-                    sourceMapIsValid = true;
+                    sourceMapIsValid = JNI_TRUE;
                     return;
                 default:
                     ignoreSection();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -26,14 +26,12 @@
 package com.sun.crypto.provider;
 
 import java.io.*;
-import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
 import java.security.AlgorithmParametersSpi;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
-import sun.misc.HexDumpEncoder;
 import sun.security.util.*;
 
 /**
@@ -259,26 +257,25 @@
         String kdfAlgo = null;
         String cipherAlgo = null;
 
-        DerValue pBES2Algorithms = new DerValue(encoded);
-        if (pBES2Algorithms.tag != DerValue.tag_Sequence) {
-            throw new IOException("PBE parameter parsing error: "
-                                  + "not an ASN.1 SEQUENCE tag");
-        }
-        if (!pkcs5PBES2_OID.equals(pBES2Algorithms.data.getOID())) {
-            throw new IOException("PBE parameter parsing error: "
-                + "expecting the object identifier for PBES2");
-        }
-        if (pBES2Algorithms.tag != DerValue.tag_Sequence) {
+        DerValue pBES2_params = new DerValue(encoded);
+        if (pBES2_params.tag != DerValue.tag_Sequence) {
             throw new IOException("PBE parameter parsing error: "
                 + "not an ASN.1 SEQUENCE tag");
         }
+        DerValue kdf = pBES2_params.data.getDerValue();
 
-        DerValue pBES2_params = pBES2Algorithms.data.getDerValue();
-        if (pBES2_params.tag != DerValue.tag_Sequence) {
-            throw new IOException("PBE parameter parsing error: "
-                + "not an ASN.1 SEQUENCE tag");
+        // Before JDK-8202837, PBES2-params was mistakenly encoded like
+        // an AlgorithmId which is a sequence of its own OID and the real
+        // PBES2-params. If the first DerValue is an OID instead of a
+        // PBES2-KDFs (which should be a SEQUENCE), we are likely to be
+        // dealing with this buggy encoding. Skip the OID and treat the
+        // next DerValue as the real PBES2-params.
+        if (kdf.getTag() == DerValue.tag_ObjectId) {
+            pBES2_params = pBES2_params.data.getDerValue();
+            kdf = pBES2_params.data.getDerValue();
         }
-        kdfAlgo = parseKDF(pBES2_params.data.getDerValue());
+
+        kdfAlgo = parseKDF(kdf);
 
         if (pBES2_params.tag != DerValue.tag_Sequence) {
             throw new IOException("PBE parameter parsing error: "
@@ -291,7 +288,6 @@
     }
 
     private String parseKDF(DerValue keyDerivationFunc) throws IOException {
-        String kdfAlgo = null;
 
         if (!pkcs5PBKDF2_OID.equals(keyDerivationFunc.data.getOID())) {
             throw new IOException("PBE parameter parsing error: "
@@ -316,34 +312,41 @@
                 + "not an ASN.1 OCTET STRING tag");
         }
         iCount = pBKDF2_params.data.getInteger();
-        DerValue keyLength = pBKDF2_params.data.getDerValue();
-        if (keyLength.tag == DerValue.tag_Integer) {
-            keysize = keyLength.getInteger() * 8; // keysize (in bits)
-        }
-        if (pBKDF2_params.tag == DerValue.tag_Sequence) {
-            DerValue prf = pBKDF2_params.data.getDerValue();
-            kdfAlgo_OID = prf.data.getOID();
-            if (hmacWithSHA1_OID.equals(kdfAlgo_OID)) {
-                kdfAlgo = "HmacSHA1";
-            } else if (hmacWithSHA224_OID.equals(kdfAlgo_OID)) {
-                kdfAlgo = "HmacSHA224";
-            } else if (hmacWithSHA256_OID.equals(kdfAlgo_OID)) {
-                kdfAlgo = "HmacSHA256";
-            } else if (hmacWithSHA384_OID.equals(kdfAlgo_OID)) {
-                kdfAlgo = "HmacSHA384";
-            } else if (hmacWithSHA512_OID.equals(kdfAlgo_OID)) {
-                kdfAlgo = "HmacSHA512";
-            } else {
-                throw new IOException("PBE parameter parsing error: "
-                    + "expecting the object identifier for a HmacSHA key "
-                    + "derivation function");
+        // keyLength INTEGER (1..MAX) OPTIONAL,
+        if (pBKDF2_params.data.available() > 0) {
+            DerValue keyLength = pBKDF2_params.data.getDerValue();
+            if (keyLength.tag == DerValue.tag_Integer) {
+                keysize = keyLength.getInteger() * 8; // keysize (in bits)
             }
-            if (prf.data.available() != 0) {
-                // parameter is 'NULL' for all HmacSHA KDFs
-                DerValue parameter = prf.data.getDerValue();
-                if (parameter.tag != DerValue.tag_Null) {
+        }
+        // prf AlgorithmIdentifier {{PBKDF2-PRFs}} DEFAULT algid-hmacWithSHA1
+        String kdfAlgo = "HmacSHA1";
+        if (pBKDF2_params.data.available() > 0) {
+            if (pBKDF2_params.tag == DerValue.tag_Sequence) {
+                DerValue prf = pBKDF2_params.data.getDerValue();
+                kdfAlgo_OID = prf.data.getOID();
+                if (hmacWithSHA1_OID.equals(kdfAlgo_OID)) {
+                    kdfAlgo = "HmacSHA1";
+                } else if (hmacWithSHA224_OID.equals(kdfAlgo_OID)) {
+                    kdfAlgo = "HmacSHA224";
+                } else if (hmacWithSHA256_OID.equals(kdfAlgo_OID)) {
+                    kdfAlgo = "HmacSHA256";
+                } else if (hmacWithSHA384_OID.equals(kdfAlgo_OID)) {
+                    kdfAlgo = "HmacSHA384";
+                } else if (hmacWithSHA512_OID.equals(kdfAlgo_OID)) {
+                    kdfAlgo = "HmacSHA512";
+                } else {
                     throw new IOException("PBE parameter parsing error: "
-                        + "not an ASN.1 NULL tag");
+                            + "expecting the object identifier for a HmacSHA key "
+                            + "derivation function");
+                }
+                if (prf.data.available() != 0) {
+                    // parameter is 'NULL' for all HmacSHA KDFs
+                    DerValue parameter = prf.data.getDerValue();
+                    if (parameter.tag != DerValue.tag_Null) {
+                        throw new IOException("PBE parameter parsing error: "
+                                + "not an ASN.1 NULL tag");
+                    }
                 }
             }
         }
@@ -396,8 +399,6 @@
 
     protected byte[] engineGetEncoded() throws IOException {
         DerOutputStream out = new DerOutputStream();
-        DerOutputStream pBES2Algorithms = new DerOutputStream();
-        pBES2Algorithms.putOID(pkcs5PBES2_OID);
 
         DerOutputStream pBES2_params = new DerOutputStream();
 
@@ -407,7 +408,10 @@
         DerOutputStream pBKDF2_params = new DerOutputStream();
         pBKDF2_params.putOctetString(salt); // choice: 'specified OCTET STRING'
         pBKDF2_params.putInteger(iCount);
-        pBKDF2_params.putInteger(keysize / 8); // derived key length (in octets)
+
+        if (keysize > 0) {
+            pBKDF2_params.putInteger(keysize / 8); // derived key length (in octets)
+        }
 
         DerOutputStream prf = new DerOutputStream();
         // algorithm is id-hmacWithSHA1/SHA224/SHA256/SHA384/SHA512
@@ -431,8 +435,7 @@
         }
         pBES2_params.write(DerValue.tag_Sequence, encryptionScheme);
 
-        pBES2Algorithms.write(DerValue.tag_Sequence, pBES2_params);
-        out.write(DerValue.tag_Sequence, pBES2Algorithms);
+        out.write(DerValue.tag_Sequence, pBES2_params);
 
         return out.toByteArray();
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/RSACipher.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/RSACipher.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/RSACipher.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/crypto/provider/RSACipher.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,6 +25,7 @@
 
 package com.sun.crypto.provider;
 
+import java.util.Arrays;
 import java.util.Locale;
 
 import java.security.*;
@@ -346,28 +347,40 @@
             throw new IllegalBlockSizeException("Data must not be longer "
                 + "than " + buffer.length + " bytes");
         }
+        byte[] paddingCopy = null;
+        byte[] result = null;
         try {
-            byte[] data;
             switch (mode) {
             case MODE_SIGN:
-                data = padding.pad(buffer, 0, bufOfs);
-                return RSACore.rsa(data, privateKey, true);
+                paddingCopy = padding.pad(buffer, 0, bufOfs);
+                result = RSACore.rsa(paddingCopy, privateKey, true);
+                break;
             case MODE_VERIFY:
                 byte[] verifyBuffer = RSACore.convert(buffer, 0, bufOfs);
-                data = RSACore.rsa(verifyBuffer, publicKey);
-                return padding.unpad(data);
+                paddingCopy = RSACore.rsa(verifyBuffer, publicKey);
+                result = padding.unpad(paddingCopy);
+                break;
             case MODE_ENCRYPT:
-                data = padding.pad(buffer, 0, bufOfs);
-                return RSACore.rsa(data, publicKey);
+                paddingCopy = padding.pad(buffer, 0, bufOfs);
+                result = RSACore.rsa(paddingCopy, publicKey);
+                break;
             case MODE_DECRYPT:
                 byte[] decryptBuffer = RSACore.convert(buffer, 0, bufOfs);
-                data = RSACore.rsa(decryptBuffer, privateKey, false);
-                return padding.unpad(data);
+                paddingCopy = RSACore.rsa(decryptBuffer, privateKey, false);
+                result = padding.unpad(paddingCopy);
+                break;
             default:
                 throw new AssertionError("Internal error");
             }
+            return result;
         } finally {
+            Arrays.fill(buffer, 0, bufOfs, (byte)0);
             bufOfs = 0;
+            if (paddingCopy != null             // will not happen
+                    && paddingCopy != buffer    // already cleaned
+                    && paddingCopy != result) { // DO NOT CLEAN, THIS IS RESULT!
+                Arrays.fill(paddingCopy, (byte)0);
+            }
         }
     }
 
@@ -403,6 +416,7 @@
         byte[] result = doFinal();
         int n = result.length;
         System.arraycopy(result, 0, out, outOfs, n);
+        Arrays.fill(result, (byte)0);
         return n;
     }
 
@@ -413,15 +427,19 @@
         if ((encoded == null) || (encoded.length == 0)) {
             throw new InvalidKeyException("Could not obtain encoded key");
         }
-        if (encoded.length > buffer.length) {
-            throw new InvalidKeyException("Key is too long for wrapping");
-        }
-        update(encoded, 0, encoded.length);
         try {
-            return doFinal();
-        } catch (BadPaddingException e) {
-            // should not occur
-            throw new InvalidKeyException("Wrapping failed", e);
+            if (encoded.length > buffer.length) {
+                throw new InvalidKeyException("Key is too long for wrapping");
+            }
+            update(encoded, 0, encoded.length);
+            try {
+                return doFinal();
+            } catch (BadPaddingException e) {
+                // should not occur
+                throw new InvalidKeyException("Wrapping failed", e);
+            }
+        } finally {
+            Arrays.fill(encoded, (byte)0);
         }
     }
 
@@ -451,20 +469,26 @@
             throw new InvalidKeyException("Unwrapping failed", e);
         }
 
-        if (isTlsRsaPremasterSecret) {
-            if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
-                throw new IllegalStateException(
-                        "No TlsRsaPremasterSecretParameterSpec specified");
+        try {
+            if (isTlsRsaPremasterSecret) {
+                if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
+                    throw new IllegalStateException(
+                            "No TlsRsaPremasterSecretParameterSpec specified");
+                }
+
+                // polish the TLS premaster secret
+                encoded = KeyUtil.checkTlsPreMasterSecretKey(
+                        ((TlsRsaPremasterSecretParameterSpec) spec).getClientVersion(),
+                        ((TlsRsaPremasterSecretParameterSpec) spec).getServerVersion(),
+                        random, encoded, (failover != null));
             }
 
-            // polish the TLS premaster secret
-            encoded = KeyUtil.checkTlsPreMasterSecretKey(
-                ((TlsRsaPremasterSecretParameterSpec)spec).getClientVersion(),
-                ((TlsRsaPremasterSecretParameterSpec)spec).getServerVersion(),
-                random, encoded, (failover != null));
+            return ConstructKeys.constructKey(encoded, algorithm, type);
+        } finally {
+            if (encoded != null) {
+                Arrays.fill(encoded, (byte) 0);
+            }
         }
-
-        return ConstructKeys.constructKey(encoded, algorithm, type);
     }
 
     // see JCE spec
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2021-09-01 14:33:15.000000000 +0000
@@ -514,6 +514,13 @@
             height = Math.abs(height);
         }
 
+        if (metadata.compression == BI_RGB) {
+            long imageDataSize = (width * height * (bitsPerPixel / 8));
+            if (imageDataSize > (bitmapFileSize - bitmapOffset)) {
+                throw new IIOException(I18N.getString("BMPImageReader9"));
+            }
+        }
+
         // Reset Image Layout so there's only one tile.
         //Define the color space
         ColorSpace colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties	2021-09-01 14:33:15.000000000 +0000
@@ -23,6 +23,7 @@
 BMPImageReader5=Input has not been set.
 BMPImageReader6=Unable to read the image header.
 BMPImageReader7=Invalid bitmap offset.
+BMPImageReader9=Invalid width/height for BI_RGB image data.
 BMPImageWriter0=Output is not an ImageOutputStream.
 BMPImageWriter1=The image region to be encoded is empty.
 BMPImageWriter2=Only 1 or 3 band image is encoded.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java	2021-09-01 14:33:15.000000000 +0000
@@ -1305,14 +1305,18 @@
             this.pixelStream = new DataInputStream(is);
 
             /*
-             * NB: the PNG spec declares that valid range for width
+             * PNG spec declares that valid range for width
              * and height is [1, 2^31-1], so here we may fail to allocate
              * a buffer for destination image due to memory limitation.
              *
-             * However, the recovery strategy for this case should be
-             * defined on the level of application, so we will not
-             * try to estimate the required amount of the memory and/or
-             * handle OOM in any way.
+             * If the read operation triggers OutOfMemoryError, the same
+             * will be wrapped in an IIOException at PNGImageReader.read
+             * method.
+             *
+             * The recovery strategy for this case should be defined at
+             * the level of application, so we will not try to estimate
+             * the required amount of the memory and/or handle OOM in
+             * any way.
              */
             theImage = getDestination(param,
                                       getImageTypes(0),
@@ -1611,7 +1615,16 @@
             throw new IndexOutOfBoundsException("imageIndex != 0!");
         }
 
-        readImage(param);
+        try {
+            readImage(param);
+        } catch (IOException |
+                 IllegalStateException |
+                 IllegalArgumentException e)
+        {
+            throw e;
+        } catch (Throwable e) {
+            throw new IIOException("Caught exception during read: ", e);
+        }
         return theImage;
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/Obj.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/Obj.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/Obj.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/Obj.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, 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
@@ -468,6 +468,12 @@
                     // Empty content
                     refAddrList.setElementAt(new StringRefAddr(type, null), posn);
                 } else if (val.charAt(start) == separator) {
+                    // Check if deserialization of binary RefAddr is allowed from
+                    // 'javaReferenceAddress' LDAP attribute.
+                    if (!VersionHelper12.isSerialDataAllowed()) {
+                        throw new NamingException("Object deserialization is not allowed");
+                    }
+
                     // Double separators indicate a non-StringRefAddr
                     // Content is a Base64-encoded serialized RefAddr
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java	2021-09-01 14:33:15.000000000 +0000
@@ -73,7 +73,7 @@
 
     /**
      * Returns true if deserialization of objects from 'javaSerializedData'
-     * LDAP attribute is allowed.
+     * and 'javaReferenceAddress' LDAP attributes is allowed.
      *
      * @return true if deserialization is allowed; false - otherwise
      */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/media/sound/DirectAudioDevice.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/media/sound/DirectAudioDevice.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/media/sound/DirectAudioDevice.java	2021-09-01 14:33:15.000000000 +0000
@@ -1379,18 +1379,14 @@
                 // pre-empted while another thread changes doIO and notifies,
                 // before we wait (so we sleep in wait forever).
                 synchronized(lock) {
-                    if (!doIO) {
+                    while (!doIO && thread == curThread) {
                         try {
                             lock.wait();
-                        } catch(InterruptedException ie) {
-                        } finally {
-                            if (thread != curThread) {
-                                break;
-                            }
+                        } catch (InterruptedException ignored) {
                         }
                     }
                 }
-                while (doIO) {
+                while (doIO && thread == curThread) {
                     if (newFramePosition >= 0) {
                         clipBytePosition = newFramePosition * frameSize;
                         newFramePosition = -1;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/media/sound/SoftMainMixer.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/media/sound/SoftMainMixer.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/media/sound/SoftMainMixer.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/media/sound/SoftMainMixer.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, 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
@@ -629,8 +629,8 @@
                 if (!hasactivevoices) {
                     synchronized (control_mutex) {
                         if (stoppedMixers != null) {
-                            if (stoppedMixers.contains(cmixer)) {
-                                stoppedMixers.remove(cmixer);
+                            if (stoppedMixers.contains(cmixer.mixer)) {
+                                stoppedMixers.remove(cmixer.mixer);
                                 cmixer.mixer.stop();
                             }
                         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java	2021-09-01 14:33:15.000000000 +0000
@@ -684,9 +684,11 @@
                 }
 
                 if (cred != null) {
-                   // get the principal name from the ticket cache
-                   if (principal == null) {
-                        principal = cred.getClient();
+                    // get the principal name from the ticket cache
+                    if (principal == null) {
+                        principal = cred.getProxy() != null
+                                ? cred.getProxy().getClient()
+                                : cred.getClient();
                    }
                 }
                 if (debug) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/security/ntlm/NTLM.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/com/sun/security/ntlm/NTLM.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/com/sun/security/ntlm/NTLM.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, 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
@@ -149,7 +149,7 @@
         int readShort(int offset) throws NTLMException {
             try {
                 return (internal[offset] & 0xff) +
-                        ((internal[offset+1] & 0xff << 8));
+                        (((internal[offset+1] & 0xff) << 8));
             } catch (ArrayIndexOutOfBoundsException ex) {
                 throw new NTLMException(NTLMException.PACKET_READ_ERROR,
                         "Input message incorrect size");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/awt/datatransfer/MimeType.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/awt/datatransfer/MimeType.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/awt/datatransfer/MimeType.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/awt/datatransfer/MimeType.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,6 +25,7 @@
 
 package java.awt.datatransfer;
 
+import java.io.ByteArrayOutputStream;
 import java.io.Externalizable;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
@@ -326,9 +327,12 @@
 ClassNotFoundException {
         String s = in.readUTF();
         if (s == null || s.length() == 0) { // long mime type
-            byte[] ba = new byte[in.readInt()];
-            in.readFully(ba);
-            s = new String(ba);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            int len = in.readInt();
+            while (len-- > 0) {
+                baos.write(in.readByte());
+            }
+            s = baos.toString();
         }
         try {
             parse(s);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/beans/IndexedPropertyDescriptor.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/beans/IndexedPropertyDescriptor.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/beans/IndexedPropertyDescriptor.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/beans/IndexedPropertyDescriptor.java	2021-09-01 14:33:15.000000000 +0000
@@ -429,7 +429,7 @@
     /**
      * Package-private constructor.
      * Merge two property descriptors.  Where they conflict, give the
-     * second argument (y) priority over the first argumnnt (x).
+     * second argument (y) priority over the first argument (x).
      *
      * @param x  The first (lower priority) PropertyDescriptor
      * @param y  The second (higher priority) PropertyDescriptor
@@ -437,39 +437,37 @@
 
     IndexedPropertyDescriptor(PropertyDescriptor x, PropertyDescriptor y) {
         super(x,y);
+        Method tr = null;
+        Method tw = null;
+
         if (x instanceof IndexedPropertyDescriptor) {
-            IndexedPropertyDescriptor ix = (IndexedPropertyDescriptor)x;
-            try {
-                Method xr = ix.getIndexedReadMethod();
-                if (xr != null) {
-                    setIndexedReadMethod(xr);
-                }
+            IndexedPropertyDescriptor ix = (IndexedPropertyDescriptor) x;
+            tr = ix.getIndexedReadMethod();
+            tw = ix.getIndexedWriteMethod();
+        }
+        if (y instanceof IndexedPropertyDescriptor) {
+            IndexedPropertyDescriptor iy = (IndexedPropertyDescriptor) y;
+            Method yr = iy.getIndexedReadMethod();
+            if (isAssignable(tr, yr)) {
+                tr = yr;
+            }
 
-                Method xw = ix.getIndexedWriteMethod();
-                if (xw != null) {
-                    setIndexedWriteMethod(xw);
-                }
-            } catch (IntrospectionException ex) {
-                // Should not happen
-                throw new AssertionError(ex);
+            Method yw = iy.getIndexedWriteMethod();
+            if (isAssignable(tw, yw)) {
+                tw = yw;
             }
         }
-        if (y instanceof IndexedPropertyDescriptor) {
-            IndexedPropertyDescriptor iy = (IndexedPropertyDescriptor)y;
-            try {
-                Method yr = iy.getIndexedReadMethod();
-                if (yr != null && yr.getDeclaringClass() == getClass0()) {
-                    setIndexedReadMethod(yr);
-                }
 
-                Method yw = iy.getIndexedWriteMethod();
-                if (yw != null && yw.getDeclaringClass() == getClass0()) {
-                    setIndexedWriteMethod(yw);
-                }
-            } catch (IntrospectionException ex) {
-                // Should not happen
-                throw new AssertionError(ex);
+        try {
+            if(tr != null) {
+                setIndexedReadMethod(tr);
+            }
+            if(tw != null) {
+                setIndexedWriteMethod(tw);
             }
+        } catch(IntrospectionException ex) {
+            // Should not happen
+            throw new AssertionError(ex);
         }
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/beans/PropertyDescriptor.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/beans/PropertyDescriptor.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/beans/PropertyDescriptor.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/beans/PropertyDescriptor.java	2021-09-01 14:33:15.000000000 +0000
@@ -715,7 +715,7 @@
         appendTo(sb, "writeMethod", this.writeMethodRef.get());
     }
 
-    private boolean isAssignable(Method m1, Method m2) {
+    boolean isAssignable(Method m1, Method m2) {
         if (m1 == null) {
             return true; // choose second method
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/lang/Character.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/lang/Character.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/lang/Character.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/lang/Character.java	2021-09-01 14:33:15.000000000 +0000
@@ -2571,7 +2571,7 @@
                              "ARABIC MATHEMATICAL ALPHABETIC SYMBOLS",
                              "ARABICMATHEMATICALALPHABETICSYMBOLS");
 
-        private static final int blockStarts[] = {
+        private static final int[] blockStarts = {
             0x0000,   // 0000..007F; Basic Latin
             0x0080,   // 0080..00FF; Latin-1 Supplement
             0x0100,   // 0100..017F; Latin Extended-A
@@ -4368,7 +4368,7 @@
             UNKNOWN
         };
 
-        private static HashMap<String, Character.UnicodeScript> aliases;
+        private static final HashMap<String, Character.UnicodeScript> aliases;
         static {
             aliases = new HashMap<>(128);
             aliases.put("ARAB", ARABIC);
@@ -4651,8 +4651,7 @@
      * @return  a string representation of this object.
      */
     public String toString() {
-        char buf[] = {value};
-        return String.valueOf(buf);
+        return String.valueOf(value);
     }
 
     /**
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URLClassLoader.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URLClassLoader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URLClassLoader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URLClassLoader.java	2021-09-01 14:33:15.000000000 +0000
@@ -369,6 +369,11 @@
                                 return defineClass(name, res);
                             } catch (IOException e) {
                                 throw new ClassNotFoundException(name, e);
+                            } catch (ClassFormatError e2) {
+                                if (res.getDataError() != null) {
+                                    e2.addSuppressed(res.getDataError());
+                                }
+                                throw e2;
                             }
                         } else {
                             return null;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URL.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URL.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URL.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URL.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2021, 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
@@ -214,7 +214,7 @@
      * The host's IP address, used in equals and hashCode.
      * Computed on demand. An uninitialized or unknown hostAddress is null.
      */
-    transient InetAddress hostAddress;
+    private transient InetAddress hostAddress;
 
     /**
      * The URLStreamHandler for this URL.
@@ -744,6 +744,31 @@
     }
 
     /**
+     * Returns the address of the host represented by this URL.
+     * A {@link SecurityException} or an {@link UnknownHostException}
+     * while getting the host address will result in this method returning
+     * {@code null}
+     *
+     * @return an {@link InetAddress} representing the host
+     */
+    synchronized InetAddress getHostAddress() {
+        if (hostAddress != null) {
+            return hostAddress;
+        }
+
+        if (host == null || host.isEmpty()) {
+            return null;
+        }
+        try {
+            hostAddress = InetAddress.getByName(host);
+        } catch (UnknownHostException | SecurityException ex) {
+            return null;
+        }
+        return hostAddress;
+    }
+
+
+    /**
      * Gets the query part of this {@code URL}.
      *
      * @return  the query part of this {@code URL},
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URLStreamHandler.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URLStreamHandler.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/net/URLStreamHandler.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/net/URLStreamHandler.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2021, 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
@@ -430,23 +430,8 @@
      * IP address.
      * @since 1.3
      */
-    protected synchronized InetAddress getHostAddress(URL u) {
-        if (u.hostAddress != null)
-            return u.hostAddress;
-
-        String host = u.getHost();
-        if (host == null || host.equals("")) {
-            return null;
-        } else {
-            try {
-                u.hostAddress = InetAddress.getByName(host);
-            } catch (UnknownHostException ex) {
-                return null;
-            } catch (SecurityException se) {
-                return null;
-            }
-        }
-        return u.hostAddress;
+    protected InetAddress getHostAddress(URL u) {
+        return u.getHostAddress();
     }
 
     /**
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/time/zone/ZoneRules.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/time/zone/ZoneRules.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/time/zone/ZoneRules.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/time/zone/ZoneRules.java	2021-09-01 14:33:15.000000000 +0000
@@ -420,7 +420,10 @@
     }
 
     /**
-     * Reads the state from the stream.
+     * Reads the state from the stream. The 1,024 limit to the lengths
+     * of stdTrans and savSize is intended to be the size well enough
+     * to accommodate the max number of transitions in current tzdb data
+     * (203 for Asia/Tehran).
      *
      * @param in  the input stream, not null
      * @return the created object, not null
@@ -428,6 +431,9 @@
      */
     static ZoneRules readExternal(DataInput in) throws IOException, ClassNotFoundException {
         int stdSize = in.readInt();
+        if (stdSize > 1024) {
+            throw new InvalidObjectException("Too many transitions");
+        }
         long[] stdTrans = (stdSize == 0) ? EMPTY_LONG_ARRAY
                                          : new long[stdSize];
         for (int i = 0; i < stdSize; i++) {
@@ -438,6 +444,9 @@
             stdOffsets[i] = Ser.readOffset(in);
         }
         int savSize = in.readInt();
+        if (savSize > 1024) {
+            throw new InvalidObjectException("Too many saving offsets");
+        }
         long[] savTrans = (savSize == 0) ? EMPTY_LONG_ARRAY
                                          : new long[savSize];
         for (int i = 0; i < savSize; i++) {
@@ -448,6 +457,9 @@
             savOffsets[i] = Ser.readOffset(in);
         }
         int ruleSize = in.readByte();
+        if (ruleSize > 16) {
+            throw new InvalidObjectException("Too many transition rules");
+        }
         ZoneOffsetTransitionRule[] rules = (ruleSize == 0) ?
             EMPTY_LASTRULES : new ZoneOffsetTransitionRule[ruleSize];
         for (int i = 0; i < ruleSize; i++) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/HashMap.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/HashMap.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/HashMap.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/HashMap.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -27,6 +27,7 @@
 
 import java.io.IOException;
 import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -1370,23 +1371,28 @@
      *         could not be found
      * @throws IOException if an I/O error occurs
      */
-    private void readObject(java.io.ObjectInputStream s)
+    private void readObject(ObjectInputStream s)
         throws IOException, ClassNotFoundException {
-        // Read in the threshold (ignored), loadfactor, and any hidden stuff
-        s.defaultReadObject();
+
+        ObjectInputStream.GetField fields = s.readFields();
+
+        // Read loadFactor (ignore threshold)
+        float lf = fields.get("loadFactor", 0.75f);
+        if (lf <= 0 || Float.isNaN(lf))
+            throw new InvalidObjectException("Illegal load factor: " + lf);
+
+        lf = Math.min(Math.max(0.25f, lf), 4.0f);
+        HashMap.UnsafeHolder.putLoadFactor(this, lf);
+
         reinitialize();
-        if (loadFactor <= 0 || Float.isNaN(loadFactor))
-            throw new InvalidObjectException("Illegal load factor: " +
-                                             loadFactor);
+
         s.readInt();                // Read and ignore number of buckets
         int mappings = s.readInt(); // Read number of mappings (size)
-        if (mappings < 0)
-            throw new InvalidObjectException("Illegal mappings count: " +
-                                             mappings);
-        else if (mappings > 0) { // (if zero, use defaults)
-            // Size the table using given load factor only if within
-            // range of 0.25...4.0
-            float lf = Math.min(Math.max(0.25f, loadFactor), 4.0f);
+        if (mappings < 0) {
+            throw new InvalidObjectException("Illegal mappings count: " + mappings);
+        } else if (mappings == 0) {
+            // use defaults
+        } else if (mappings > 0) {
             float fc = (float)mappings / lf + 1.0f;
             int cap = ((fc < DEFAULT_INITIAL_CAPACITY) ?
                        DEFAULT_INITIAL_CAPACITY :
@@ -1415,6 +1421,24 @@
         }
     }
 
+    // Support for resetting final field during deserializing
+    private static final class UnsafeHolder {
+        private UnsafeHolder() { throw new InternalError(); }
+        private static final sun.misc.Unsafe unsafe
+                = sun.misc.Unsafe.getUnsafe();
+        private static final long LF_OFFSET;
+        static {
+            try {
+                LF_OFFSET = unsafe.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+            } catch (NoSuchFieldException nfe) {
+                throw new InternalError();
+            }
+        }
+        static void putLoadFactor(HashMap<?, ?> map, float lf) {
+            unsafe.putFloat(map, LF_OFFSET, lf);
+        }
+    }
+
     /* ------------------------------------------------------------ */
     // iterators
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/HashSet.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/HashSet.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/HashSet.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/HashSet.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -294,8 +294,8 @@
      */
     private void readObject(java.io.ObjectInputStream s)
         throws java.io.IOException, ClassNotFoundException {
-        // Read in any hidden serialization magic
-        s.defaultReadObject();
+        // Consume and ignore stream fields (currently zero).
+        s.readFields();
 
         // Read capacity and verify non-negative.
         int capacity = s.readInt();
@@ -310,12 +310,13 @@
             throw new InvalidObjectException("Illegal load factor: " +
                                              loadFactor);
         }
+        // Clamp load factor to range of 0.25...4.0.
+        loadFactor = Math.min(Math.max(0.25f, loadFactor), 4.0f);
 
         // Read size and verify non-negative.
         int size = s.readInt();
         if (size < 0) {
-            throw new InvalidObjectException("Illegal size: " +
-                                             size);
+            throw new InvalidObjectException("Illegal size: " + size);
         }
         // Set the capacity according to the size and load factor ensuring that
         // the HashMap is at least 25% full but clamping to maximum capacity.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarFile.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarFile.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarFile.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarFile.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -74,6 +74,8 @@
     private JarVerifier jv;
     private boolean jvInitialized;
     private boolean verify;
+    // The maximum size of array to allocate. Some VMs reserve some header words in an array.
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 
     // indicates if Class-Path attribute present (only valid if hasCheckedSpecialAttributes true)
     private boolean hasClassPathAttribute;
@@ -85,6 +87,9 @@
         SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
     }
 
+    private static final sun.misc.JavaUtilZipFileAccess JUZFA =
+            sun.misc.SharedSecrets.getJavaUtilZipFileAccess();
+
     /**
      * The JAR manifest file name.
      */
@@ -192,7 +197,13 @@
                 if (verify) {
                     byte[] b = getBytes(manEntry);
                     if (!jvInitialized) {
-                        jv = new JarVerifier(b);
+                        if (JUZFA.getManifestNum(this) == 1) {
+                            jv = new JarVerifier(manEntry.getName(), b);
+                        } else {
+                            if (JarVerifier.debug != null) {
+                                JarVerifier.debug.println("Multiple MANIFEST.MF found. Treat JAR file as unsigned");
+                            }
+                        }
                     }
                     man = new Manifest(jv, new ByteArrayInputStream(b));
                 } else {
@@ -422,7 +433,11 @@
      */
     private byte[] getBytes(ZipEntry ze) throws IOException {
         try (InputStream is = super.getInputStream(ze)) {
-            int len = (int)ze.getSize();
+            long uncompressedSize = ze.getSize();
+            if (uncompressedSize > MAX_ARRAY_SIZE) {
+                throw new IOException("Unsupported size: " + uncompressedSize);
+            }
+            int len = (int)uncompressedSize;
             byte[] b = IOUtils.readAllBytes(is);
             if (len != -1 && b.length != len)
                 throw new EOFException("Expected:" + len + ", read:" + b.length);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarInputStream.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarInputStream.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarInputStream.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarInputStream.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -95,7 +95,7 @@
             man.read(new ByteArrayInputStream(bytes));
             closeEntry();
             if (doVerify) {
-                jv = new JarVerifier(bytes);
+                jv = new JarVerifier(e.getName(), bytes);
                 mev = new ManifestEntryVerifier(man);
             }
             return (JarEntry)super.getNextEntry();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarVerifier.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarVerifier.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/jar/JarVerifier.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/jar/JarVerifier.java	2021-09-01 14:33:15.000000000 +0000
@@ -84,6 +84,9 @@
     /** the bytes for the manDig object */
     byte manifestRawBytes[] = null;
 
+    /** the manifest name this JarVerifier is created upon */
+    final String manifestName;
+
     /** controls eager signature validation */
     boolean eagerValidation;
 
@@ -93,7 +96,8 @@
     /** collect -DIGEST-MANIFEST values for blacklist */
     private List<Object> manifestDigests;
 
-    public JarVerifier(byte rawBytes[]) {
+    public JarVerifier(String name, byte rawBytes[]) {
+        manifestName = name;
         manifestRawBytes = rawBytes;
         sigFileSigners = new Hashtable<>();
         verifiedSigners = new Hashtable<>();
@@ -180,7 +184,7 @@
 
         // only set the jev object for entries that have a signature
         // (either verified or not)
-        if (!name.equals(JarFile.MANIFEST_NAME)) {
+        if (!name.equalsIgnoreCase(JarFile.MANIFEST_NAME)) {
             if (sigFileSigners.get(name) != null ||
                     verifiedSigners.get(name) != null) {
                 mev.setEntry(name, je);
@@ -272,7 +276,8 @@
                             }
 
                             sfv.setSignatureFile(bytes);
-                            sfv.process(sigFileSigners, manifestDigests);
+                            sfv.process(sigFileSigners, manifestDigests,
+                                    manifestName);
                         }
                     }
                     return;
@@ -315,7 +320,7 @@
                         sfv.setSignatureFile(bytes);
                     }
                 }
-                sfv.process(sigFileSigners, manifestDigests);
+                sfv.process(sigFileSigners, manifestDigests, manifestName);
 
             } catch (IOException ioe) {
                 // e.g. sun.security.pkcs.ParsingException
@@ -430,9 +435,9 @@
         manDig = null;
         // MANIFEST.MF is always treated as signed and verified,
         // move its signers from sigFileSigners to verifiedSigners.
-        if (sigFileSigners.containsKey(JarFile.MANIFEST_NAME)) {
-            CodeSigner[] codeSigners = sigFileSigners.remove(JarFile.MANIFEST_NAME);
-            verifiedSigners.put(JarFile.MANIFEST_NAME, codeSigners);
+        if (sigFileSigners.containsKey(manifestName)) {
+            CodeSigner[] codeSigners = sigFileSigners.remove(manifestName);
+            verifiedSigners.put(manifestName, codeSigners);
         }
     }
 
@@ -886,7 +891,7 @@
      */
     boolean isTrustedManifestEntry(String name) {
         // How many signers? MANIFEST.MF is always verified
-        CodeSigner[] forMan = verifiedSigners.get(JarFile.MANIFEST_NAME);
+        CodeSigner[] forMan = verifiedSigners.get(manifestName);
         if (forMan == null) {
             return true;
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/logging/FileHandler.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/logging/FileHandler.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/logging/FileHandler.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/logging/FileHandler.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -36,6 +36,7 @@
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
@@ -478,6 +479,22 @@
                         channel = FileChannel.open(lockFilePath,
                                 CREATE_NEW, WRITE);
                         fileCreated = true;
+                    } catch (AccessDeniedException ade) {
+                        // This can be either a temporary, or a more permanent issue.
+                        // The lock file might be still pending deletion from a previous run
+                        // (temporary), or the parent directory might not be accessible,
+                        // not writable, etc..
+                        // If we can write to the current directory, and this is a regular file,
+                        // let's try again.
+                        if (Files.isRegularFile(lockFilePath, LinkOption.NOFOLLOW_LINKS)
+                            && isParentWritable(lockFilePath)) {
+                            // Try again. If it doesn't work, then this will
+                            // eventually ensure that we increment "unique" and
+                            // use another file name.
+                            continue;
+                        } else {
+                            throw ade; // no need to retry
+                        }
                     } catch (FileAlreadyExistsException ix) {
                         // This may be a zombie file left over by a previous
                         // execution. Reuse it - but only if we can actually
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/zip/ZipFile.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/zip/ZipFile.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/java/util/zip/ZipFile.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/java/util/zip/ZipFile.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2021, 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
@@ -42,6 +42,7 @@
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.WeakHashMap;
+import java.util.jar.JarFile;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -63,6 +64,7 @@
     private final int total;       // total number of entries
     private final boolean locsig;  // if zip file starts with LOCSIG (usually true)
     private volatile boolean closeRequested = false;
+    private int manifestNum = 0;       // number of META-INF/MANIFEST.MF, case insensitive
 
     private static final int STORED = ZipEntry.STORED;
     private static final int DEFLATED = ZipEntry.DEFLATED;
@@ -211,6 +213,7 @@
                                                Integer.toHexString(mode));
         }
         String name = file.getPath();
+        file = new File(name);
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkRead(name);
@@ -228,6 +231,7 @@
         this.name = name;
         this.total = getTotal(jzfile);
         this.locsig = startsWithLOC(jzfile);
+        this.manifestNum = getManifestNum(jzfile);
     }
 
     /**
@@ -800,6 +804,9 @@
                 public boolean startsWithLocHeader(ZipFile zip) {
                     return zip.startsWithLocHeader();
                 }
+                public int getManifestNum(JarFile jar) {
+                    return ((ZipFile)jar).getManifestNum();
+                }
              }
         );
     }
@@ -812,10 +819,23 @@
         return locsig;
     }
 
+    /*
+     * Returns the number of the META-INF/MANIFEST.MF entries, case insensitive.
+     * When this number is greater than 1, JarVerifier will treat a file as
+     * unsigned.
+     */
+    private int getManifestNum() {
+        synchronized (this) {
+            ensureOpen();
+            return manifestNum;
+        }
+    }
+
     private static native long open(String name, int mode, long lastModified,
                                     boolean usemmap) throws IOException;
     private static native int getTotal(long jzfile);
     private static native boolean startsWithLOC(long jzfile);
+    private static native int getManifestNum(long jzfile);
     private static native int read(long jzfile, long jzentry,
                                    long pos, byte[] b, int off, int len);
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/IvParameterSpec.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/IvParameterSpec.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/IvParameterSpec.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/IvParameterSpec.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -76,13 +76,16 @@
         if (iv == null) {
             throw new IllegalArgumentException("IV missing");
         }
-        if (iv.length - offset < len) {
-            throw new IllegalArgumentException
-                ("IV buffer too short for given offset/length combination");
+        if (offset < 0) {
+            throw new ArrayIndexOutOfBoundsException("offset is negative");
         }
         if (len < 0) {
             throw new ArrayIndexOutOfBoundsException("len is negative");
         }
+        if (iv.length - offset < len) {
+            throw new IllegalArgumentException
+                ("IV buffer too short for given offset/length combination");
+        }
         this.iv = new byte[len];
         System.arraycopy(iv, offset, this.iv, 0, len);
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -114,7 +114,12 @@
         this.version = version;
         this.rounds = rounds;
         this.wordSize = wordSize;
-        if (iv == null) throw new IllegalArgumentException("IV missing");
+        if (iv == null) {
+            throw new IllegalArgumentException("IV missing");
+        }
+        if (offset < 0) {
+            throw new ArrayIndexOutOfBoundsException("offset is negative");
+        }
         int blockSize = (wordSize / 8) * 2;
         if (iv.length - offset < blockSize) {
             throw new IllegalArgumentException("IV too short");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/SecretKeySpec.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/SecretKeySpec.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/crypto/spec/SecretKeySpec.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/crypto/spec/SecretKeySpec.java	2021-09-01 14:33:15.000000000 +0000
@@ -144,13 +144,16 @@
         if (key.length == 0) {
             throw new IllegalArgumentException("Empty key");
         }
-        if (key.length-offset < len) {
-            throw new IllegalArgumentException
-                ("Invalid offset/length combination");
+        if (offset < 0) {
+            throw new ArrayIndexOutOfBoundsException("offset is negative");
         }
         if (len < 0) {
             throw new ArrayIndexOutOfBoundsException("len is negative");
         }
+        if (key.length - offset < len) {
+            throw new IllegalArgumentException
+                ("Invalid offset/length combination");
+        }
         this.key = new byte[len];
         System.arraycopy(key, offset, this.key, 0, len);
         this.algorithm = algorithm;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/JComboBox.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/JComboBox.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/JComboBox.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/JComboBox.java	2021-09-01 14:33:15.000000000 +0000
@@ -568,6 +568,8 @@
                 if (!found) {
                     return;
                 }
+
+                getEditor().setItem(anObject);
             }
 
             // Must toggle the state of this flag since this method
@@ -1307,16 +1309,12 @@
      * do not call or override.
      */
     public void actionPerformed(ActionEvent e) {
-        ComboBoxEditor editor = getEditor();
-        if ((editor != null) && (e != null) && (editor == e.getSource()
-                || editor.getEditorComponent() == e.getSource())) {
-            setPopupVisible(false);
-            getModel().setSelectedItem(editor.getItem());
-            String oldCommand = getActionCommand();
-            setActionCommand("comboBoxEdited");
-            fireActionEvent();
-            setActionCommand(oldCommand);
-        }
+        setPopupVisible(false);
+        getModel().setSelectedItem(getEditor().getItem());
+        String oldCommand = getActionCommand();
+        setActionCommand("comboBoxEdited");
+        fireActionEvent();
+        setActionCommand(oldCommand);
     }
 
     /**
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/JList.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/JList.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/JList.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/JList.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -3308,7 +3308,6 @@
                 }
 
                 s.add(AccessibleState.SELECTABLE);
-                s.add(AccessibleState.VISIBLE);
                 if (parent.isFocusOwner()
                     && (indexInParent == parent.getLeadSelectionIndex())) {
                     s.add(AccessibleState.ACTIVE);
@@ -3321,6 +3320,11 @@
                 } else if (s.contains(AccessibleState.SHOWING)) {
                     s.remove(AccessibleState.SHOWING);
                 }
+                if (this.isVisible()) {
+                    s.add(AccessibleState.VISIBLE);
+                } else if (s.contains(AccessibleState.VISIBLE)) {
+                    s.remove(AccessibleState.VISIBLE);
+                }
                 s.add(AccessibleState.TRANSIENT); // cell-rendered
                 return s;
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFParser.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFParser.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFParser.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFParser.java	2021-09-01 14:33:15.000000000 +0000
@@ -232,25 +232,52 @@
           currentCharacters.append(ch);
         } else {
           /* TODO: Test correct behavior of \bin keyword */
+
           if (pendingKeyword.equals("bin")) {  /* magic layer-breaking kwd */
-            long parameter = Long.parseLong(currentCharacters.toString());
+            long parameter = 0L;
+            try {
+              parameter = Long.parseLong(currentCharacters.toString());
+            } catch (NumberFormatException e) {
+              warning("Illegal number format " + currentCharacters.toString()
+                              + " in \bin tag");
+              pendingKeyword = null;
+              currentCharacters = new StringBuffer();
+              state = S_text;
+              // Delimiters here are interpreted as text too
+              if (!Character.isWhitespace(ch))
+                write(ch);
+              break;
+            }
             pendingKeyword = null;
             state = S_inblob;
+            int maxBytes = 4 * 1024 * 1024;
             binaryBytesLeft = parameter;
-            if (binaryBytesLeft > Integer.MAX_VALUE)
-                binaryBuf = new ByteArrayOutputStream(Integer.MAX_VALUE);
-            else
-                binaryBuf = new ByteArrayOutputStream((int)binaryBytesLeft);
+
+            if (binaryBytesLeft > maxBytes) {
+              binaryBuf = new ByteArrayOutputStream(maxBytes);
+            } else if (binaryBytesLeft < 0) {
+              binaryBytesLeft = 0;
+              binaryBuf = new ByteArrayOutputStream((int)binaryBytesLeft);
+            } else {
+              binaryBuf = new ByteArrayOutputStream((int) binaryBytesLeft);
+            }
             savedSpecials = specialsTable;
             specialsTable = allSpecialsTable;
             break;
           }
 
-          int parameter = Integer.parseInt(currentCharacters.toString());
-          ok = handleKeyword(pendingKeyword, parameter);
-          if (!ok)
-            warning("Unknown keyword: " + pendingKeyword +
-                    " (param " + currentCharacters + ")");
+          int parameter = 0;
+          try {
+            parameter = Integer.parseInt(currentCharacters.toString());
+            ok = handleKeyword(pendingKeyword, parameter);
+            if (!ok) {
+                warning("Unknown keyword: " + pendingKeyword +
+                        " (param " + currentCharacters + ")");
+            }
+          } catch (NumberFormatException e) {
+            warning("Illegal number format " + currentCharacters.toString()
+                    + " in " + pendingKeyword + " tag");
+          }
           pendingKeyword = null;
           currentCharacters = new StringBuffer();
           state = S_text;
@@ -279,14 +306,16 @@
         }
         break;
       case S_inblob:
-        binaryBuf.write(ch);
-        binaryBytesLeft --;
+        if (binaryBytesLeft > 0) {
+          binaryBuf.write(ch);
+          binaryBytesLeft--;
+        }
         if (binaryBytesLeft == 0) {
-            state = S_text;
-            specialsTable = savedSpecials;
-            savedSpecials = null;
-            handleBinaryBlob(binaryBuf.toByteArray());
-            binaryBuf = null;
+          state = S_text;
+          specialsTable = savedSpecials;
+          savedSpecials = null;
+          handleBinaryBlob(binaryBuf.toByteArray());
+          binaryBuf = null;
         }
       }
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFReader.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFReader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFReader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/javax/swing/text/rtf/RTFReader.java	2021-09-01 14:33:15.000000000 +0000
@@ -66,12 +66,12 @@
   Dictionary<Integer, String> fontTable;
   /** This array maps color indices to Color objects. */
   Color[] colorTable;
-  /** This array maps character style numbers to Style objects. */
-  Style[] characterStyles;
-  /** This array maps paragraph style numbers to Style objects. */
-  Style[] paragraphStyles;
-  /** This array maps section style numbers to Style objects. */
-  Style[] sectionStyles;
+  /** This Map maps character style numbers to Style objects. */
+  Map<Integer, Style> characterStyles;
+  /** This Map maps paragraph style numbers to Style objects. */
+  Map<Integer, Style> paragraphStyles;
+  /** This Map maps section style numbers to Style objects. */
+  Map<Integer, Style> sectionStyles;
 
   /** This is the RTF version number, extracted from the \rtf keyword.
    *  The version information is currently not used. */
@@ -832,9 +832,9 @@
 
     public void close()
     {
-        Vector<Style> chrStyles = new Vector<Style>();
-        Vector<Style> pgfStyles = new Vector<Style>();
-        Vector<Style> secStyles = new Vector<Style>();
+        Map<Integer, Style> chrStyles = new HashMap<>();
+        Map<Integer, Style> pgfStyles = new HashMap<>();
+        Map<Integer, Style> secStyles = new HashMap<>();
         Enumeration<StyleDefiningDestination> styles = definedStyles.elements();
         while(styles.hasMoreElements()) {
             StyleDefiningDestination style;
@@ -843,32 +843,24 @@
             defined = style.realize();
             warning("Style "+style.number+" ("+style.styleName+"): "+defined);
             String stype = (String)defined.getAttribute(Constants.StyleType);
-            Vector<Style> toSet;
+            Map<Integer, Style> toMap;
             if (stype.equals(Constants.STSection)) {
-                toSet = secStyles;
+                toMap = secStyles;
             } else if (stype.equals(Constants.STCharacter)) {
-                toSet = chrStyles;
+                toMap = chrStyles;
             } else {
-                toSet = pgfStyles;
+                toMap = pgfStyles;
             }
-            if (toSet.size() <= style.number)
-                toSet.setSize(style.number + 1);
-            toSet.setElementAt(defined, style.number);
+            toMap.put(style.number, defined);
         }
         if (!(chrStyles.isEmpty())) {
-            Style[] styleArray = new Style[chrStyles.size()];
-            chrStyles.copyInto(styleArray);
-            characterStyles = styleArray;
+            characterStyles = chrStyles;
         }
         if (!(pgfStyles.isEmpty())) {
-            Style[] styleArray = new Style[pgfStyles.size()];
-            pgfStyles.copyInto(styleArray);
-            paragraphStyles = styleArray;
+            paragraphStyles = pgfStyles;
         }
         if (!(secStyles.isEmpty())) {
-            Style[] styleArray = new Style[secStyles.size()];
-            secStyles.copyInto(styleArray);
-            sectionStyles = styleArray;
+            sectionStyles = secStyles;
         }
 
 /* (old debugging code)
@@ -951,6 +943,14 @@
 
         public boolean handleKeyword(String keyword, int parameter)
         {
+            // As per http://www.biblioscape.com/rtf15_spec.htm#Heading2
+            // we are restricting control word delimiter numeric value
+            // to be within -32767 through 32767
+            if (parameter > 32767) {
+                parameter = 32767;
+            } else if (parameter < -32767) {
+                parameter = -32767;
+            }
             if (keyword.equals("s")) {
                 characterStyle = false;
                 sectionStyle = false;
@@ -973,19 +973,27 @@
             return true;
         }
 
-        public Style realize()
+        public Style realize() {
+            return realize(null);
+        }
+
+        private Style realize(Set<Integer> alreadyMetBasisIndexSet)
         {
             Style basis = null;
             Style next = null;
 
+            if (alreadyMetBasisIndexSet == null) {
+                alreadyMetBasisIndexSet = new HashSet<>();
+            }
+
             if (realizedStyle != null)
                 return realizedStyle;
 
-            if (basedOn != STYLENUMBER_NONE) {
+            if (basedOn != STYLENUMBER_NONE && alreadyMetBasisIndexSet.add(basedOn)) {
                 StyleDefiningDestination styleDest;
-                styleDest = definedStyles.get(Integer.valueOf(basedOn));
+                styleDest = definedStyles.get(basedOn);
                 if (styleDest != null && styleDest != this) {
-                    basis = styleDest.realize();
+                    basis = styleDest.realize(alreadyMetBasisIndexSet);
                 }
             }
 
@@ -1280,19 +1288,19 @@
 
         if (keyword.equals("s") &&
             paragraphStyles != null) {
-            parserState.put("paragraphStyle", paragraphStyles[parameter]);
+            parserState.put("paragraphStyle", paragraphStyles.get(parameter));
             return true;
         }
 
         if (keyword.equals("cs") &&
             characterStyles != null) {
-            parserState.put("characterStyle", characterStyles[parameter]);
+            parserState.put("characterStyle", characterStyles.get(parameter));
             return true;
         }
 
         if (keyword.equals("ds") &&
             sectionStyles != null) {
-            parserState.put("sectionStyle", sectionStyles[parameter]);
+            parserState.put("sectionStyle", sectionStyles.get(parameter));
             return true;
         }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java	2021-09-01 14:33:15.000000000 +0000
@@ -622,6 +622,9 @@
                         | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
             } else if ("SourceDebugExtension".equals(attrName)) {
                 int len = readInt(u + 4);
+                if (len > b.length - (u + 8)) {
+                    throw new IllegalArgumentException();
+                }
                 sourceDebug = readUTF(u + 8, len, new char[len]);
             } else if (ANNOTATIONS
                     && "RuntimeInvisibleAnnotations".equals(attrName)) {
@@ -1070,6 +1073,9 @@
         int maxLocals = readUnsignedShort(u + 2);
         int codeLength = readInt(u + 4);
         u += 8;
+        if (codeLength > b.length - u) {
+            throw new IllegalArgumentException();
+        }
 
         // reads the bytecode to find the labels
         int codeStart = u;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/JVM.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/JVM.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/JVM.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/JVM.java	2021-09-01 14:33:15.000000000 +0000
@@ -177,6 +177,14 @@
      */
     public static native void log(int tagSetId, int level, String message);
 
+    /**
+     * Check whether the logger would output on the given level
+     *
+     * @param level on level
+     * @return {@literal true} if the logger would output on the given level
+     */
+    public static native boolean shouldLog(int level);
+
      /**
       * Subscribe to LogLevel updates for LogTag
       *
@@ -524,4 +532,4 @@
      * @return if it is time to perform a chunk rotation
      */
     public native boolean shouldRotateDisk();
-}
+}
\ No newline at end of file
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/Logger.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/Logger.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/Logger.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/Logger.java	2021-09-01 14:33:15.000000000 +0000
@@ -62,8 +62,6 @@
     }
 
     public static boolean shouldLog(LogTag tag, LogLevel level) {
-        // Logging level is not initialized because of lack of Xlog support in jdk8,
-        // so this method returns true directly now.
-        return true; // TODO: level.level >= tag.tagSetLevel;
+        return JVM.shouldLog(level.level);
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/RequestEngine.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/RequestEngine.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/RequestEngine.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/jdk/jfr/internal/RequestEngine.java	2021-09-01 14:33:15.000000000 +0000
@@ -67,7 +67,9 @@
                     } else {
                         jvm.emitEvent(type.getId(), JVM.counterTime(), 0);
                     }
-                    Logger.log(LogTag.JFR_SYSTEM_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+                    if (Logger.shouldLog(LogTag.JFR_EVENT, LogLevel.DEBUG)) {
+                        Logger.log(LogTag.JFR_SYSTEM_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+                    }
                 } else {
                     executeSecure();
                 }
@@ -83,7 +85,9 @@
                 public Void run() {
                     try {
                         hook.run();
-                        Logger.log(LogTag.JFR_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+                        if (Logger.shouldLog(LogTag.JFR_EVENT, LogLevel.DEBUG)) {
+                            Logger.log(LogTag.JFR_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+                        }
                     } catch (Throwable t) {
                         // Prevent malicious user to propagate exception callback in the wrong context
                         Logger.log(LogTag.JFR_EVENT, LogLevel.WARN, "Exception occured during execution of period hook for " + type.getLogName());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java	2021-09-01 14:33:15.000000000 +0000
@@ -39,6 +39,7 @@
 
 import javax.xml.crypto.*;
 import javax.xml.crypto.dom.*;
+import java.net.URI;
 
 /**
  * DOM-based implementation of URIDereferencer.
@@ -72,9 +73,27 @@
 
         boolean secVal = Utils.secureValidation(context);
 
-        if (secVal && Policy.restrictReferenceUriScheme(uri)) {
-            throw new URIReferenceException(
-                "Uri " + uri + " is forbidden when secure validation is enabled");
+        if (secVal) {
+            try {
+                if (Policy.restrictReferenceUriScheme(uri)) {
+                    throw new URIReferenceException(
+                            "URI " + uri + " is forbidden when secure validation is enabled");
+                }
+
+                if (uri != null && !uri.isEmpty() && uri.charAt(0) != '#' && URI.create(uri).getScheme() == null) {
+                    // beseURI will be used to dereference a relative uri
+                    try {
+                        if (Policy.restrictReferenceUriScheme(baseURI)) {
+                            throw new URIReferenceException(
+                                    "Base URI " + baseURI + " is forbidden when secure validation is enabled");
+                        }
+                    } catch (IllegalArgumentException e) { // thrown by Policy.restrictReferenceUriScheme
+                        throw new URIReferenceException("Invalid base URI " + baseURI);
+                    }
+                }
+            } catch (IllegalArgumentException e) { // thrown by Policy.restrictReferenceUriScheme or URI.create
+                throw new URIReferenceException("Invalid URI " + uri);
+            }
         }
 
         // Check if same-document URI and already registered on the context
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/awt/image/VolatileSurfaceManager.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/awt/image/VolatileSurfaceManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/awt/image/VolatileSurfaceManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/awt/image/VolatileSurfaceManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -246,7 +246,7 @@
      * SurfaceData object, or null if the surface creation was not successful.
      *
      * Platform-specific subclasses should initialize an accelerated
-     * surface (e.g. a DirectDraw surface on Windows, an OpenGL pbuffer,
+     * surface (e.g. a DirectDraw surface on Windows, an OpenGL FBO,
      * or an X11 pixmap).
      */
     protected abstract SurfaceData initAcceleratedSurface();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/awt/SunToolkit.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/awt/SunToolkit.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/awt/SunToolkit.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/awt/SunToolkit.java	2021-09-01 14:33:15.000000000 +0000
@@ -1620,9 +1620,9 @@
      */
     protected abstract boolean syncNativeQueue(final long timeout);
 
-    private boolean eventDispatched = false;
-    private boolean queueEmpty = false;
-    private final Object waitLock = "Wait Lock";
+    private boolean eventDispatched;
+    private boolean queueEmpty;
+    private final Object waitLock = new Object();
 
     private boolean isEQEmpty() {
         EventQueue queue = getSystemEventQueueImpl();
@@ -1639,10 +1639,11 @@
     @SuppressWarnings("serial")
     protected final boolean waitForIdle(final long timeout) {
         flushPendingEvents();
-        boolean queueWasEmpty = isEQEmpty();
-        queueEmpty = false;
-        eventDispatched = false;
-        synchronized(waitLock) {
+        final boolean queueWasEmpty;
+        synchronized (waitLock) {
+            queueWasEmpty = isEQEmpty();
+            queueEmpty = false;
+            eventDispatched = false;
             postEvent(AppContext.getAppContext(),
                       new PeerEvent(getSystemEventQueueImpl(), null, PeerEvent.LOW_PRIORITY_EVENT) {
                           public void dispatch() {
@@ -1943,6 +1944,9 @@
 
     public synchronized void setWindowDeactivationTime(Window w, long time) {
         AppContext ctx = getAppContext(w);
+        if (ctx == null) {
+            return;
+        }
         WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
         if (map == null) {
             map = new WeakHashMap<Window, Long>();
@@ -1953,6 +1957,9 @@
 
     public synchronized long getWindowDeactivationTime(Window w) {
         AppContext ctx = getAppContext(w);
+        if (ctx == null) {
+            return -1;
+        }
         WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
         if (map == null) {
             return -1;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/font/TrueTypeFont.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/font/TrueTypeFont.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/font/TrueTypeFont.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/font/TrueTypeFont.java	2021-09-01 14:33:15.000000000 +0000
@@ -587,6 +587,10 @@
                     && getDirectoryEntry(hheaTag) == null) {
                 throw new FontFormatException("missing hhea table");
             }
+            ByteBuffer maxpTable = getTableBuffer(maxpTag);
+            if (maxpTable.getChar(4) == 0) {
+                throw new FontFormatException("zero glyphs");
+            }
             initNames();
         } catch (Exception e) {
             if (FontUtilities.isLogging()) {
@@ -1066,24 +1070,36 @@
 
     private void setStrikethroughMetrics(ByteBuffer os_2Table, int upem) {
         if (os_2Table == null || os_2Table.capacity() < 30 || upem < 0) {
-            stSize = .05f;
-            stPos = -.4f;
+            stSize = 0.05f;
+            stPos = -0.4f;
             return;
         }
         ShortBuffer sb = os_2Table.asShortBuffer();
         stSize = sb.get(13) / (float)upem;
         stPos = -sb.get(14) / (float)upem;
+        if (stSize < 0f) {
+            stSize = 0.05f;
+        }
+        if (Math.abs(stPos) > 2.0f) {
+            stPos = -0.4f;
+        }
     }
 
     private void setUnderlineMetrics(ByteBuffer postTable, int upem) {
         if (postTable == null || postTable.capacity() < 12 || upem < 0) {
-            ulSize = .05f;
-            ulPos = .1f;
+            ulSize = 0.05f;
+            ulPos = 0.1f;
             return;
         }
         ShortBuffer sb = postTable.asShortBuffer();
         ulSize = sb.get(5) / (float)upem;
         ulPos = -sb.get(4) / (float)upem;
+        if (ulSize < 0f) {
+            ulSize = 0.05f;
+        }
+        if (Math.abs(ulPos) > 2.0f) {
+            ulPos = 0.1f;
+        }
     }
 
     @Override
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLContext.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLContext.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLContext.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLContext.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -164,9 +164,6 @@
         @Native
         static final int CAPS_EXT_FBOBJECT     =
                 (CAPS_RT_TEXTURE_ALPHA | CAPS_RT_TEXTURE_OPAQUE);
-        /** Indicates that the context supports a stored alpha channel. */
-        @Native
-        static final int CAPS_STORED_ALPHA     = CAPS_RT_PLAIN_ALPHA;
         /** Indicates that the context is doublebuffered. */
         @Native
         static final int CAPS_DOUBLEBUFFERED   = (FIRST_PRIVATE_CAP << 0);
@@ -209,9 +206,6 @@
             if ((caps & CAPS_EXT_FBOBJECT) != 0) {
                 buf.append("CAPS_EXT_FBOBJECT|");
             }
-            if ((caps & CAPS_STORED_ALPHA) != 0) {
-                buf.append("CAPS_STORED_ALPHA|");
-            }
             if ((caps & CAPS_DOUBLEBUFFERED) != 0) {
                 buf.append("CAPS_DOUBLEBUFFERED|");
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -92,7 +92,6 @@
  * OGL Type          Corresponding SurfaceType
  * --------          -------------------------
  * WINDOW            OpenGLSurface
- * PBUFFER           OpenGLSurface
  * TEXTURE           OpenGLTexture
  * FLIP_BACKBUFFER   OpenGLSurface
  * FBOBJECT          OpenGLSurfaceRTT
@@ -105,7 +104,6 @@
      *
      * @see sun.java2d.pipe.hw.AccelSurface
      */
-    public static final int PBUFFER         = RT_PLAIN;
     public static final int FBOBJECT        = RT_TEXTURE;
 
     /**
@@ -173,9 +171,6 @@
                                           boolean texRect,
                                           int width, int height);
     protected native boolean initFlipBackbuffer(long pData);
-    protected abstract boolean initPbuffer(long pData, long pConfigInfo,
-                                           boolean isOpaque,
-                                           int width, int height);
 
     private native int getTextureTarget(long pData);
     private native int getTextureID(long pData);
@@ -251,7 +246,6 @@
             return OpenGLTexture;
         case FBOBJECT:
             return OpenGLSurfaceRTT;
-        case PBUFFER:
         default:
             return OpenGLSurface;
         }
@@ -267,13 +261,6 @@
         boolean success = false;
 
         switch (type) {
-        case PBUFFER:
-            success = initPbuffer(getNativeOps(),
-                                  graphicsConfig.getNativeConfigInfo(),
-                                  isOpaque,
-                                  width, height);
-            break;
-
         case TEXTURE:
             success = initTexture(getNativeOps(),
                                   isOpaque, isTexNonPow2Available(),
@@ -312,10 +299,9 @@
         try {
             switch (type) {
             case TEXTURE:
-            case PBUFFER:
             case FBOBJECT:
                 // need to make sure the context is current before
-                // creating the texture (or pbuffer, or fbobject)
+                // creating the texture or fbobject
                 OGLContext.setScratchSurface(graphicsConfig);
                 break;
             default:
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLUtilities.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLUtilities.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLUtilities.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/opengl/OGLUtilities.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -51,7 +51,6 @@
      */
     public static final int UNDEFINED       = OGLSurfaceData.UNDEFINED;
     public static final int WINDOW          = OGLSurfaceData.WINDOW;
-    public static final int PBUFFER         = OGLSurfaceData.PBUFFER;
     public static final int TEXTURE         = OGLSurfaceData.TEXTURE;
     public static final int FLIP_BACKBUFFER = OGLSurfaceData.FLIP_BACKBUFFER;
     public static final int FBOBJECT        = OGLSurfaceData.FBOBJECT;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -43,8 +43,7 @@
      */
     @Native public static final int WINDOW          = 1;
     /**
-     * Render-To Plain surface (pbuffer for OpenGL, Render Target surface
-     * for Direct3D)
+     * Render-To Plain surface (Render Target surface for Direct3D)
      */
     @Native public static final int RT_PLAIN        = 2;
     /**
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/JavaUtilZipFileAccess.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/JavaUtilZipFileAccess.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/JavaUtilZipFileAccess.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/JavaUtilZipFileAccess.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, 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
@@ -25,9 +25,11 @@
 
 package sun.misc;
 
+import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 
 public interface JavaUtilZipFileAccess {
     public boolean startsWithLocHeader(ZipFile zip);
+    public int getManifestNum(JarFile zip);
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/Resource.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/Resource.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/Resource.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/Resource.java	2021-09-01 14:33:15.000000000 +0000
@@ -184,4 +184,12 @@
     public CodeSigner[] getCodeSigners() {
         return null;
     }
+
+    /**
+     * Returns non-fatal reading error during data retrieval if there's any.
+     * For example, CRC error when reading a JAR entry.
+     */
+    public Exception getDataError() {
+        return null;
+    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/URLClassPath.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/URLClassPath.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/misc/URLClassPath.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/misc/URLClassPath.java	2021-09-01 14:33:15.000000000 +0000
@@ -30,6 +30,7 @@
 import sun.misc.JarIndex;
 import sun.misc.InvalidJarIndexException;
 import sun.net.www.ParseUtil;
+import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.jar.JarEntry;
 import java.util.jar.Manifest;
@@ -980,6 +981,7 @@
             }
 
             return new Resource() {
+                private Exception dataError = null;
                 public String getName() { return name; }
                 public URL getURL() { return url; }
                 public URL getCodeSourceURL() { return csu; }
@@ -995,6 +997,18 @@
                     { return entry.getCertificates(); };
                 public CodeSigner[] getCodeSigners()
                     { return entry.getCodeSigners(); };
+                public Exception getDataError()
+                    { return dataError; }
+                public byte[] getBytes() throws IOException {
+                    byte[] bytes = super.getBytes();
+                    CRC32 crc32 = new CRC32();
+                    crc32.update(bytes);
+                    if (crc32.getValue() != entry.getCrc()) {
+                        dataError = new IOException(
+                                "CRC error while extracting entry from JAR file");
+                    }
+                    return bytes;
+                }
             };
         }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/ftp/impl/FtpClient.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/ftp/impl/FtpClient.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/ftp/impl/FtpClient.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/ftp/impl/FtpClient.java	2021-09-01 14:33:15.000000000 +0000
@@ -24,14 +24,32 @@
  */
 package sun.net.ftp.impl;
 
-import java.net.*;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
@@ -44,7 +62,11 @@
 import javax.net.ssl.SSLSocketFactory;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
-import sun.net.ftp.*;
+import sun.net.ftp.FtpDirEntry;
+import sun.net.ftp.FtpDirParser;
+import sun.net.ftp.FtpProtocolException;
+import sun.net.ftp.FtpReplyCode;
+import sun.net.util.IPAddressUtil;
 import sun.util.logging.PlatformLogger;
 
 
@@ -107,15 +129,16 @@
     private static Pattern[] patterns;
     private static Pattern linkp = Pattern.compile("(\\p{Print}+) \\-\\> (\\p{Print}+)$");
     private DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, java.util.Locale.US);
-
+    private static final boolean acceptPasvAddressVal;
     static {
         final int vals[] = {0, 0};
         final String encs[] = {null};
-
+        final String acceptPasvAddress[] = {null};
         AccessController.doPrivileged(
                 new PrivilegedAction<Object>() {
 
                     public Object run() {
+                        acceptPasvAddress[0] = System.getProperty("jdk.net.ftp.trustPasvAddress", "false");
                         vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 300_000).intValue();
                         vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 300_000).intValue();
                         encs[0] = System.getProperty("file.encoding", "ISO8859_1");
@@ -147,6 +170,8 @@
         for (int i = 0; i < patStrings.length; i++) {
             patterns[i] = Pattern.compile(patStrings[i]);
         }
+
+        acceptPasvAddressVal = Boolean.parseBoolean(acceptPasvAddress[0]);
     }
 
     /**
@@ -624,7 +649,6 @@
             //
             // The regular expression is a bit more complex this time, because
             // the parenthesis are optionals and we have to use 3 groups.
-
             if (pasvPat == null) {
                 pasvPat = Pattern.compile("227 .* \\(?(\\d{1,3},\\d{1,3},\\d{1,3},\\d{1,3}),(\\d{1,3}),(\\d{1,3})\\)?");
             }
@@ -636,8 +660,15 @@
             port = Integer.parseInt(m.group(3)) + (Integer.parseInt(m.group(2)) << 8);
             // IP address is simple
             String s = m.group(1).replace(',', '.');
-            dest = new InetSocketAddress(s, port);
+            if (!IPAddressUtil.isIPv4LiteralAddress(s))
+                throw new FtpProtocolException("PASV failed : "  + serverAnswer);
+            if (acceptPasvAddressVal) {
+                dest = new InetSocketAddress(s, port);
+            } else {
+                dest = validatePasvAddress(port, s, server.getInetAddress());
+            }
         }
+
         // Got everything, let's open the socket!
         Socket s;
         if (proxy != null) {
@@ -699,6 +730,76 @@
         return s;
     }
 
+    static final String ERROR_MSG = "Address should be the same as originating server";
+
+    /**
+     * Returns an InetSocketAddress, based on value of acceptPasvAddressVal
+     * and other conditions such as the server address returned by pasv
+     * is not a hostname, is a socks proxy, or the loopback. An exception
+     * is thrown if none of the valid conditions are met.
+     */
+    private InetSocketAddress validatePasvAddress(int port, String s, InetAddress address)
+        throws FtpProtocolException
+    {
+        if (address == null) {
+            return InetSocketAddress.createUnresolved(serverAddr.getHostName(), port);
+        }
+        String serverAddress = address.getHostAddress();
+        if (serverAddress.equals(s)) {
+            return new InetSocketAddress(s, port);
+        } else if (address.isLoopbackAddress() && s.startsWith("127.")) { // can be 127.0
+            return new InetSocketAddress(s, port);
+        } else if (address.isLoopbackAddress()) {
+            if (privilegedLocalHost().getHostAddress().equals(s)) {
+                return new InetSocketAddress(s, port);
+            } else {
+                throw new FtpProtocolException(ERROR_MSG);
+            }
+        } else if (s.startsWith("127.")) {
+            if (privilegedLocalHost().equals(address)) {
+                return new InetSocketAddress(s, port);
+            } else {
+                throw new FtpProtocolException(ERROR_MSG);
+            }
+        }
+        String hostName = address.getHostName();
+        if (!(IPAddressUtil.isIPv4LiteralAddress(hostName) || IPAddressUtil.isIPv6LiteralAddress(hostName))) {
+            InetAddress[] names = privilegedGetAllByName(hostName);
+            String resAddress = Arrays
+                .stream(names)
+                .map(InetAddress::getHostAddress)
+                .filter(s::equalsIgnoreCase)
+                .findFirst()
+                .orElse(null);
+            if (resAddress != null) {
+                return new InetSocketAddress(s, port);
+            }
+        }
+        throw new FtpProtocolException(ERROR_MSG);
+    }
+
+    private static InetAddress privilegedLocalHost() throws FtpProtocolException {
+        PrivilegedExceptionAction<InetAddress> action = InetAddress::getLocalHost;
+        try {
+            return AccessController.doPrivileged(action);
+        } catch (Exception e) {
+            FtpProtocolException ftpEx = new FtpProtocolException(ERROR_MSG);
+            ftpEx.initCause(e);
+            throw ftpEx;
+        }
+    }
+
+    private static InetAddress[] privilegedGetAllByName(String hostName) throws FtpProtocolException {
+        PrivilegedExceptionAction<InetAddress[]> pAction = () -> InetAddress.getAllByName(hostName);
+        try {
+            return AccessController.doPrivileged(pAction);
+        } catch (Exception e) {
+            FtpProtocolException ftpEx = new FtpProtocolException(ERROR_MSG);
+            ftpEx.initCause(e);
+            throw ftpEx;
+        }
+    }
+
     /**
      * Opens a data connection with the server according to the set mode
      * (ACTIVE or PASSIVE) then send the command passed as an argument.
@@ -709,7 +810,6 @@
      */
     private Socket openDataConnection(String cmd) throws sun.net.ftp.FtpProtocolException, IOException {
         Socket clientSocket;
-
         if (passiveMode) {
             try {
                 return openPassiveDataConnection(cmd);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/httpserver/ServerImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/httpserver/ServerImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/httpserver/ServerImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/httpserver/ServerImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -559,17 +559,42 @@
                 start = space+1;
                 String version = requestLine.substring (start);
                 Headers headers = req.headers();
-                String s = headers.getFirst ("Transfer-encoding");
+                /* check key for illegal characters */
+                for (String k : headers.keySet()) {
+                    if (!isValidHeaderKey(k)) {
+                        reject(Code.HTTP_BAD_REQUEST, requestLine,
+                                "Header key contains illegal characters");
+                        return;
+                    }
+                }
+                /* checks for unsupported combinations of lengths and encodings */
+                if (headers.containsKey("Content-Length") &&
+                        (headers.containsKey("Transfer-encoding") || headers.get("Content-Length").size() > 1)) {
+                    reject(Code.HTTP_BAD_REQUEST, requestLine,
+                            "Conflicting or malformed headers detected");
+                    return;
+                }
                 long clen = 0L;
-                if (s !=null && s.equalsIgnoreCase ("chunked")) {
-                    clen = -1L;
+                String headerValue = null;
+                List<String> teValueList = headers.get("Transfer-encoding");
+                if (teValueList != null && !teValueList.isEmpty()) {
+                    headerValue = teValueList.get(0);
+                }
+                if (headerValue != null) {
+                    if (headerValue.equalsIgnoreCase("chunked") && teValueList.size() == 1) {
+                        clen = -1L;
+                    } else {
+                        reject(Code.HTTP_NOT_IMPLEMENTED,
+                                requestLine, "Unsupported Transfer-Encoding value");
+                        return;
+                    }
                 } else {
-                    s = headers.getFirst ("Content-Length");
-                    if (s != null) {
-                        clen = Long.parseLong(s);
+                    headerValue = headers.getFirst("Content-Length");
+                    if (headerValue != null) {
+                        clen = Long.parseLong(headerValue);
                     }
                     if (clen == 0) {
-                        requestCompleted (connection);
+                        requestCompleted(connection);
                     }
                 }
                 ctx = contexts.findContext (protocol, uri.getPath());
@@ -877,4 +902,24 @@
             return secs * 1000;
         }
     }
+
+    /*
+     * Validates a RFC 7230 header-key.
+     */
+    static boolean isValidHeaderKey(String token) {
+        if (token == null) return false;
+
+        boolean isValidChar;
+        char[] chars = token.toCharArray();
+        String validSpecialChars = "!#$%&'*+-.^_`|~";
+        for (char c : chars) {
+            isValidChar = ((c >= 'a') && (c <= 'z')) ||
+                          ((c >= 'A') && (c <= 'Z')) ||
+                          ((c >= '0') && (c <= '9'));
+            if (!isValidChar && validSpecialChars.indexOf(c) == -1) {
+                return false;
+            }
+        }
+        return !token.isEmpty();
+    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/httpserver/SSLStreams.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/httpserver/SSLStreams.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/httpserver/SSLStreams.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/httpserver/SSLStreams.java	2021-09-01 14:33:15.000000000 +0000
@@ -430,11 +430,16 @@
             handshaking.lock();
             ByteBuffer tmp = allocate(BufType.APPLICATION);
             WrapperResult r;
+            Status st;
+            HandshakeStatus hs;
             do {
                 tmp.clear();
                 tmp.flip ();
                 r = wrapper.wrapAndSendX (tmp, true);
-            } while (r.result.getStatus() != Status.CLOSED);
+                hs = r.result.getHandshakeStatus();
+                st = r.result.getStatus();
+            } while (st != Status.CLOSED &&
+                        !(st == Status.OK && hs == HandshakeStatus.NOT_HANDSHAKING));
         } finally {
             handshaking.unlock();
         }
@@ -510,7 +515,7 @@
                 throw new IOException ("SSL stream is closed");
             }
             if (eof) {
-                return 0;
+                return -1;
             }
             int available=0;
             if (!needData) {
@@ -523,7 +528,7 @@
                 bbuf = r.buf== bbuf? bbuf: r.buf;
                 if ((available=bbuf.remaining()) == 0) {
                     eof = true;
-                    return 0;
+                    return -1;
                 } else {
                     needData = false;
                 }
@@ -574,7 +579,7 @@
         /**
          * close the SSL connection. All data must have been consumed
          * before this is called. Otherwise an exception will be thrown.
-         * [Note. May need to revisit this. not quite the normal close() symantics
+         * [Note. May need to revisit this. not quite the normal close() semantics
          */
         public void close () throws IOException {
             eof = true;
@@ -588,8 +593,11 @@
         byte single[] = new byte [1];
 
         public int read () throws IOException {
+            if (eof) {
+                return -1;
+            }
             int n = read (single, 0, 1);
-            if (n == 0) {
+            if (n <= 0) {
                 return -1;
             } else {
                 return single[0] & 0xFF;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2021-09-01 14:33:15.000000000 +0000
@@ -1134,7 +1134,7 @@
              * 1) if (instProxy != null)
              *        connect to instProxy; raise exception if failed
              * 2) else use system default ProxySelector
-             * 3) is 2) fails, make direct connection
+             * 3) else make a direct connection if ProxySelector is not present
              */
 
             if (instProxy == null) { // no instance Proxy is set
@@ -1177,10 +1177,7 @@
                             if (p != Proxy.NO_PROXY) {
                                 sel.connectFailed(uri, p.address(), ioex);
                                 if (!it.hasNext()) {
-                                    // fallback to direct connection
-                                    http = getNewHttpClient(url, null, connectTimeout, false);
-                                    http.setReadTimeout(readTimeout);
-                                    break;
+                                    throw ioex;
                                 }
                             } else {
                                 throw ioex;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/nio/ch/SocketAdaptor.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/nio/ch/SocketAdaptor.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/nio/ch/SocketAdaptor.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/nio/ch/SocketAdaptor.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -198,6 +198,9 @@
             throws IOException
         {
             synchronized (sc.blockingLock()) {
+                if (!sc.isOpen()) {
+                    throw new ClosedChannelException();
+                }
                 if (!sc.isBlocking())
                     throw new IllegalBlockingModeException();
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/reflect/generics/parser/SignatureParser.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/reflect/generics/parser/SignatureParser.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -64,8 +64,9 @@
     // invalid, the parser should flag an error in accordance
     // with its logic.
 
-    private char[] input; // the input signature
-    private int index = 0; // index into the input
+    private String input; // the input signature
+    private int index;    // index into the input
+    private int mark;     // index of mark
     // used to mark end of input
     private static final char EOI = ':';
     private static final boolean DEBUG = false;
@@ -73,6 +74,12 @@
     // private constructor - enforces use of static factory
     private SignatureParser(){}
 
+    // prepares parser for new parsing session
+    private void init(String s) {
+        input = s;
+        mark = index = 0;
+    }
+
     // Utility methods.
 
     // Most parsing routines use the following routines to access the
@@ -80,39 +87,32 @@
     // This makes it easy to adapt the parser to operate on streams
     // of various kinds as well as strings.
 
-    // returns current element of the input and advances the input
-    private char getNext(){
-        assert(index <= input.length);
-        try {
-            return input[index++];
-        } catch (ArrayIndexOutOfBoundsException e) { return EOI;}
-    }
-
     // returns current element of the input
     private char current(){
-        assert(index <= input.length);
-        try {
-            return input[index];
-        } catch (ArrayIndexOutOfBoundsException e) { return EOI;}
+        assert(index <= input.length());
+        return index < input.length() ? input.charAt(index) : EOI;
     }
 
     // advance the input
     private void advance(){
-        assert(index <= input.length);
-        index++;
+        assert(index <= input.length());
+        if (index < input.length()) index++;
+    }
+
+    // mark current position
+    private void mark() {
+        mark = index;
     }
 
     // For debugging, prints current character to the end of the input.
     private String remainder() {
-        return new String(input, index, input.length-index);
+        return input.substring(index);
     }
 
-    // Match c against a "set" of characters
-    private boolean matches(char c, char... set) {
-        for (char e : set) {
-            if (c == e) return true;
-        }
-        return false;
+    // returns a substring of input from mark (inclusive)
+    // to current position (exclusive)
+    private String markToCurrent() {
+        return input.substring(mark, index);
     }
 
     // Error handling routine. Encapsulates error handling.
@@ -152,7 +152,7 @@
      */
     public ClassSignature parseClassSig(String s) {
         if (DEBUG) System.out.println("Parsing class sig:" + s);
-        input = s.toCharArray();
+        init(s);
         return parseClassSignature();
     }
 
@@ -167,7 +167,7 @@
      */
     public MethodTypeSignature parseMethodSig(String s) {
         if (DEBUG) System.out.println("Parsing method sig:" + s);
-        input = s.toCharArray();
+        init(s);
         return parseMethodTypeSignature();
     }
 
@@ -184,13 +184,13 @@
      */
     public TypeSignature parseTypeSig(String s) {
         if (DEBUG) System.out.println("Parsing type sig:" + s);
-        input = s.toCharArray();
+        init(s);
         return parseTypeSignature();
     }
 
     // Parsing routines.
     // As a rule, the parsing routines access the input using the
-    // utilities current(), getNext() and/or advance().
+    // utilities current() and advance().
     // The convention is that when a parsing routine is invoked
     // it expects the current input to be the first character it should parse
     // and when it completes parsing, it leaves the input at the first
@@ -251,28 +251,22 @@
         return FormalTypeParameter.make(id, bs);
     }
 
-    private String parseIdentifier(){
-        StringBuilder result = new StringBuilder();
-        while (!Character.isWhitespace(current())) {
-            char c = current();
-            switch(c) {
-            case ';':
-            case '.':
-            case '/':
-            case '[':
-            case ':':
-            case '>':
-            case '<':
-                return result.toString();
-            default:{
-                result.append(c);
-                advance();
-            }
+    private String parseIdentifier() {
+        mark();
+        skipIdentifier();
+        return markToCurrent();
+    }
 
-            }
+    private void skipIdentifier() {
+        char c = current();
+        while (c != ';' && c != '.' && c != '/' &&
+               c != '[' && c != ':' && c != '>' &&
+               c != '<' && !Character.isWhitespace(c)) {
+            advance();
+            c = current();
         }
-        return result.toString();
     }
+
     /**
      * FieldTypeSignature:
      *     ClassTypeSignature
@@ -325,18 +319,13 @@
         // Parse both any optional leading PackageSpecifier as well as
         // the following SimpleClassTypeSignature.
 
-        String id = parseIdentifier();
-
-        if (current() == '/') { // package name
-            StringBuilder idBuild = new StringBuilder(id);
-
-            while(current() == '/') {
-                advance();
-                idBuild.append(".");
-                idBuild.append(parseIdentifier());
-            }
-            id = idBuild.toString();
+        mark();
+        skipIdentifier();
+        while (current() == '/') {
+            advance();
+            skipIdentifier();
         }
+        String id = markToCurrent().replace('/', '.');
 
         switch (current()) {
         case ';':
@@ -379,11 +368,6 @@
         }
     }
 
-    private TypeArgument[] parseTypeArgumentsOpt() {
-        if (current() == '<') {return parseTypeArguments();}
-        else {return new TypeArgument[0];}
-    }
-
     /**
      * TypeArguments:
      *     "<" TypeArgument+ ">"
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/jca/Providers.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/jca/Providers.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/jca/Providers.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/jca/Providers.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -86,6 +86,7 @@
         // Note: SunEC *is* in a signed JAR file, but it's not signed
         // by EC itself. So it's still safe to be listed here.
         "sun.security.ec.SunEC",
+        "com.sun.crypto.provider.SunJCE",
         BACKUP_PROVIDER_CLASSNAME,
     };
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/jgss/krb5/SubjectComber.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/jgss/krb5/SubjectComber.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/jgss/krb5/SubjectComber.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,6 +25,7 @@
 
 package sun.security.jgss.krb5;
 
+import sun.security.krb5.JavaxSecurityAuthKerberosAccess;
 import sun.security.krb5.KerberosSecrets;
 
 import javax.security.auth.kerberos.KerberosTicket;
@@ -150,83 +151,58 @@
                     Iterator<Object> iterator = pcs.iterator();
                     while (iterator.hasNext()) {
                         Object obj = iterator.next();
-                        if (obj instanceof KerberosTicket) {
-                            @SuppressWarnings("unchecked")
-                            KerberosTicket ticket = (KerberosTicket)obj;
-                            if (DEBUG) {
-                                System.out.println("Found ticket for "
-                                                    + ticket.getClient()
-                                                    + " to go to "
-                                                    + ticket.getServer()
-                                                    + " expiring on "
-                                                    + ticket.getEndTime());
-                            }
-                            if (!ticket.isCurrent()) {
-                                // let us remove the ticket from the Subject
-                                // Note that both TGT and service ticket will be
-                                // removed  upon expiration
-                                if (!subject.isReadOnly()) {
-                                    iterator.remove();
-                                    try {
-                                        ticket.destroy();
-                                        if (DEBUG) {
-                                            System.out.println("Removed and destroyed "
-                                                        + "the expired Ticket \n"
-                                                        + ticket);
-
-                                        }
-                                    } catch (DestroyFailedException dfe) {
-                                        if (DEBUG) {
-                                            System.out.println("Expired ticket not" +
-                                                    " detroyed successfully. " + dfe);
-                                        }
-                                    }
+                        if (!(obj instanceof KerberosTicket)) {
+                            continue;
+                        }
+                        @SuppressWarnings("unchecked")
+                        KerberosTicket ticket = (KerberosTicket)obj;
+                        if (DEBUG) {
+                            System.out.println("Found ticket for "
+                                                + ticket.getClient()
+                                                + " to go to "
+                                                + ticket.getServer()
+                                                + " expiring on "
+                                                + ticket.getEndTime());
+                        }
+                        if (!ticket.isCurrent()) {
+                            // let us remove the ticket from the Subject
+                            // Note that both TGT and service ticket will be
+                            // removed  upon expiration
+                            if (!subject.isReadOnly()) {
+                                iterator.remove();
+                                try {
+                                    ticket.destroy();
+                                    if (DEBUG) {
+                                        System.out.println("Removed and destroyed "
+                                                    + "the expired Ticket \n"
+                                                    + ticket);
 
+                                    }
+                                } catch (DestroyFailedException dfe) {
+                                    if (DEBUG) {
+                                        System.out.println("Expired ticket not" +
+                                                " detroyed successfully. " + dfe);
+                                    }
                                 }
-                            } else {
-                                KerberosPrincipal serverAlias = KerberosSecrets
-                                        .getJavaxSecurityAuthKerberosAccess()
-                                        .kerberosTicketGetServerAlias(ticket);
-                                if (serverPrincipal == null ||
-                                    ticket.getServer().getName().equals(serverPrincipal) ||
-                                            (serverAlias != null &&
-                                                    serverPrincipal.equals(
-                                                            serverAlias.getName())))  {
-                                    KerberosPrincipal clientAlias = KerberosSecrets
-                                            .getJavaxSecurityAuthKerberosAccess()
-                                            .kerberosTicketGetClientAlias(ticket);
-                                    if (clientPrincipal == null ||
-                                        clientPrincipal.equals(
-                                            ticket.getClient().getName()) ||
-                                            (clientAlias != null &&
-                                            clientPrincipal.equals(
-                                                    clientAlias.getName()))) {
-                                        if (oneOnly) {
-                                            return ticket;
-                                        } else {
-                                            // Record names so that tickets will
-                                            // all belong to same principals
-                                            if (clientPrincipal == null) {
-                                                if (clientAlias == null) {
-                                                    clientPrincipal =
-                                                            ticket.getClient().getName();
-                                                } else {
-                                                    clientPrincipal =
-                                                            clientAlias.getName();
-                                                }
-                                            }
-                                            if (serverPrincipal == null) {
-                                                if (serverAlias == null) {
-                                                    serverPrincipal =
-                                                            ticket.getServer().getName();
-                                                } else {
-                                                    serverPrincipal =
-                                                            serverAlias.getName();
-                                                }
-                                            }
-                                            answer.add(credClass.cast(ticket));
-                                        }
+                            }
+                            continue;
+                        }
+                        String serverMatch = findServerMatch(serverPrincipal, ticket);
+                        if (serverMatch != null) {
+                            String clientMatch = findClientMatch(clientPrincipal, ticket);
+                            if (clientMatch != null) {
+                                if (oneOnly) {
+                                    return ticket;
+                                } else {
+                                    // Record names so that tickets will
+                                    // all belong to same principals
+                                    if (clientPrincipal == null) {
+                                        clientPrincipal = clientMatch;
+                                    }
+                                    if (serverPrincipal == null) {
+                                        serverPrincipal = serverMatch;
                                     }
+                                    answer.add(credClass.cast(ticket));
                                 }
                             }
                         }
@@ -236,4 +212,40 @@
             return answer;
         }
     }
+
+    private static String findServerMatch(String input, KerberosTicket ticket) {
+        KerberosPrincipal serverAlias = KerberosSecrets
+                .getJavaxSecurityAuthKerberosAccess()
+                .kerberosTicketGetServerAlias(ticket);
+        if (input != null) {
+            return ((serverAlias != null && input.equals(serverAlias.getName())) ||
+                    input.equals(ticket.getServer().getName()))
+                    ? input : null;
+        } else {
+            return serverAlias != null
+                    ? serverAlias.getName()
+                    : ticket.getServer().getName();
+        }
+    }
+
+    private static String findClientMatch(String input, KerberosTicket ticket) {
+        JavaxSecurityAuthKerberosAccess access = KerberosSecrets
+                .getJavaxSecurityAuthKerberosAccess();
+        KerberosPrincipal clientAlias = access.kerberosTicketGetClientAlias(ticket);
+        KerberosTicket proxy = access.kerberosTicketGetProxy(ticket);
+        if (input != null) {
+            return ((clientAlias != null && input.equals(clientAlias.getName())) ||
+                    (proxy != null && input.equals(proxy.getClient().getName())) ||
+                    (proxy == null && input.equals(ticket.getClient().getName())))
+                    ? input : null;
+        } else {
+            if (clientAlias != null) {
+                return clientAlias.getName();
+            } else if (proxy != null) {
+                return proxy.getClient().getName();
+            } else {
+                return ticket.getClient().getName();
+            }
+        }
+    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -53,22 +53,22 @@
 
     /**
      * Used by a middle server to acquire credentials on behalf of a
-     * client to itself using the S4U2self extension.
-     * @param client the client to impersonate
+     * user to itself using the S4U2self extension.
+     * @param user the user to impersonate
      * @param ccreds the TGT of the middle service
-     * @return the new creds (cname=client, sname=middle)
+     * @return the new creds (cname=user, sname=middle)
      */
-    public static Credentials acquireS4U2selfCreds(PrincipalName client,
+    public static Credentials acquireS4U2selfCreds(PrincipalName user,
             Credentials ccreds) throws KrbException, IOException {
         if (!ccreds.isForwardable()) {
             throw new KrbException("S4U2self needs a FORWARDABLE ticket");
         }
         PrincipalName sname = ccreds.getClient();
-        String uRealm = client.getRealmString();
+        String uRealm = user.getRealmString();
         String localRealm = ccreds.getClient().getRealmString();
         if (!uRealm.equals(localRealm)) {
             // Referrals will be required because the middle service
-            // and the client impersonated are on different realms.
+            // and the user impersonated are on different realms.
             if (Config.DISABLE_REFERRALS) {
                 throw new KrbException("Cross-realm S4U2Self request not" +
                         " possible when referrals are disabled.");
@@ -87,10 +87,10 @@
         }
         Credentials creds = serviceCreds(
                 KDCOptions.with(KDCOptions.FORWARDABLE),
-                ccreds, ccreds.getClient(), sname, null,
-                new PAData[] {
+                ccreds, ccreds.getClient(), sname, user,
+                null, new PAData[] {
                         new PAData(Krb5.PA_FOR_USER,
-                                new PAForUserEnc(client,
+                                new PAForUserEnc(user,
                                         ccreds.getSessionKey()).asn1Encode()),
                         new PAData(Krb5.PA_PAC_OPTIONS,
                                 new PaPacOptions()
@@ -98,7 +98,7 @@
                                         .setClaims(true)
                                         .asn1Encode())
                         }, S4U2Type.SELF);
-        if (!creds.getClient().equals(client)) {
+        if (!creds.getClient().equals(user)) {
             throw new KrbException("S4U2self request not honored by KDC");
         }
         if (!creds.isForwardable()) {
@@ -136,7 +136,7 @@
         }
         Credentials creds = serviceCreds(KDCOptions.with(
                 KDCOptions.CNAME_IN_ADDL_TKT, KDCOptions.FORWARDABLE),
-                ccreds, ccreds.getClient(), backendPrincipal,
+                ccreds, ccreds.getClient(), backendPrincipal, null,
                 new Ticket[] {second}, new PAData[] {
                         new PAData(Krb5.PA_PAC_OPTIONS,
                                 new PaPacOptions()
@@ -313,7 +313,7 @@
             throws KrbException, IOException {
         return serviceCreds(new KDCOptions(), ccreds,
                 ccreds.getClient(), service, null, null,
-                S4U2Type.NONE);
+                null, S4U2Type.NONE);
     }
 
     /*
@@ -325,13 +325,13 @@
     private static Credentials serviceCreds(
             KDCOptions options, Credentials asCreds,
             PrincipalName cname, PrincipalName sname,
-            Ticket[] additionalTickets, PAData[] extraPAs,
-            S4U2Type s4u2Type)
+            PrincipalName user, Ticket[] additionalTickets,
+            PAData[] extraPAs, S4U2Type s4u2Type)
             throws KrbException, IOException {
         if (!Config.DISABLE_REFERRALS) {
             try {
                 return serviceCredsReferrals(options, asCreds, cname, sname,
-                        s4u2Type, additionalTickets, extraPAs);
+                        s4u2Type, user, additionalTickets, extraPAs);
             } catch (KrbException e) {
                 // Server may raise an error if CANONICALIZE is true.
                 // Try CANONICALIZE false.
@@ -339,7 +339,7 @@
         }
         return serviceCredsSingle(options, asCreds, cname,
                 asCreds.getClientAlias(), sname, sname, s4u2Type,
-                additionalTickets, extraPAs);
+                user, additionalTickets, extraPAs);
     }
 
     /*
@@ -349,8 +349,8 @@
     private static Credentials serviceCredsReferrals(
             KDCOptions options, Credentials asCreds,
             PrincipalName cname, PrincipalName sname,
-            S4U2Type s4u2Type, Ticket[] additionalTickets,
-            PAData[] extraPAs)
+            S4U2Type s4u2Type, PrincipalName user,
+            Ticket[] additionalTickets, PAData[] extraPAs)
                     throws KrbException, IOException {
         options = new KDCOptions(options.toBooleanArray());
         options.set(KDCOptions.CANONICALIZE, true);
@@ -362,12 +362,13 @@
         PrincipalName clientAlias = asCreds.getClientAlias();
         while (referrals.size() <= Config.MAX_REFERRALS) {
             ReferralsCache.ReferralCacheEntry ref =
-                    ReferralsCache.get(cname, sname, refSname.getRealmString());
+                    ReferralsCache.get(cname, sname, user,
+                            additionalTickets, refSname.getRealmString());
             String toRealm = null;
             if (ref == null) {
                 creds = serviceCredsSingle(options, asCreds, cname,
                         clientAlias, refSname, cSname, s4u2Type,
-                        additionalTickets, extraPAs);
+                        user, additionalTickets, extraPAs);
                 PrincipalName server = creds.getServer();
                 if (!refSname.equals(server)) {
                     String[] serverNameStrings = server.getNameStrings();
@@ -378,15 +379,9 @@
                                 serverNameStrings[1])) {
                         // Server Name (sname) has the following format:
                         //      krbtgt/TO-REALM.COM@FROM-REALM.COM
-                        if (s4u2Type == S4U2Type.NONE) {
-                            // Do not store S4U2Self or S4U2Proxy referral
-                            // TGTs in the cache. Caching such tickets is not
-                            // defined in MS-SFU and may cause unexpected
-                            // results when using them in a different context.
-                            ReferralsCache.put(cname, sname,
-                                    server.getRealmString(),
-                                    serverNameStrings[1], creds);
-                        }
+                        ReferralsCache.put(cname, sname, user,
+                                additionalTickets, server.getRealmString(),
+                                serverNameStrings[1], creds);
                         toRealm = serverNameStrings[1];
                         isReferral = true;
                     }
@@ -411,7 +406,7 @@
                     }
                     additionalTickets[0] = credsInOut[1].getTicket();
                 } else if (s4u2Type == S4U2Type.SELF) {
-                    handleS4U2SelfReferral(extraPAs, asCreds, creds);
+                    handleS4U2SelfReferral(extraPAs, user, creds);
                 }
                 if (referrals.contains(toRealm)) {
                     // Referrals loop detected
@@ -440,8 +435,8 @@
             KDCOptions options, Credentials asCreds,
             PrincipalName cname, PrincipalName clientAlias,
             PrincipalName refSname, PrincipalName sname,
-            S4U2Type s4u2Type, Ticket[] additionalTickets,
-            PAData[] extraPAs)
+            S4U2Type s4u2Type, PrincipalName user,
+            Ticket[] additionalTickets, PAData[] extraPAs)
                     throws KrbException, IOException {
         Credentials theCreds = null;
         boolean[] okAsDelegate = new boolean[]{true};
@@ -469,7 +464,7 @@
                 Credentials.printDebug(newTgt);
             }
             if (s4u2Type == S4U2Type.SELF) {
-                handleS4U2SelfReferral(extraPAs, asCreds, newTgt);
+                handleS4U2SelfReferral(extraPAs, user, newTgt);
             }
             asCreds = newTgt;
             cname = asCreds.getClient();
@@ -498,7 +493,7 @@
      * different realm or when using a referral TGT.
      */
     private static void handleS4U2SelfReferral(PAData[] pas,
-            Credentials oldCeds, Credentials newCreds)
+            PrincipalName user, Credentials newCreds)
                     throws Asn1Exception, KrbException, IOException {
         if (DEBUG) {
             System.out.println(">>> Handling S4U2Self referral");
@@ -506,11 +501,8 @@
         for (int i = 0; i < pas.length; i++) {
             PAData pa = pas[i];
             if (pa.getType() == Krb5.PA_FOR_USER) {
-                PAForUserEnc paForUser = new PAForUserEnc(
-                        new DerValue(pa.getValue()),
-                        oldCeds.getSessionKey());
                 pas[i] = new PAData(Krb5.PA_FOR_USER,
-                        new PAForUserEnc(paForUser.getName(),
+                        new PAForUserEnc(user,
                                 newCreds.getSessionKey()).asn1Encode());
                 break;
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/ReferralsCache.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/ReferralsCache.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/ReferralsCache.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/krb5/internal/ReferralsCache.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Red Hat, Inc.
+ * Copyright (c) 2019, 2021, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,14 @@
 
 package sun.security.krb5.internal;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 
 import sun.security.krb5.Credentials;
 import sun.security.krb5.PrincipalName;
@@ -51,19 +53,33 @@
     static private final class ReferralCacheKey {
         private PrincipalName cname;
         private PrincipalName sname;
-        ReferralCacheKey (PrincipalName cname, PrincipalName sname) {
+        private PrincipalName user; // S4U2Self only
+        private byte[] userSvcTicketEnc; // S4U2Proxy only
+        ReferralCacheKey (PrincipalName cname, PrincipalName sname,
+                PrincipalName user, Ticket userSvcTicket) {
             this.cname = cname;
             this.sname = sname;
+            this.user = user;
+            if (userSvcTicket != null && userSvcTicket.encPart != null) {
+                byte[] userSvcTicketEnc = userSvcTicket.encPart.getBytes();
+                if (userSvcTicketEnc.length > 0) {
+                    this.userSvcTicketEnc = userSvcTicketEnc;
+                }
+            }
         }
         public boolean equals(Object other) {
             if (!(other instanceof ReferralCacheKey))
                 return false;
             ReferralCacheKey that = (ReferralCacheKey)other;
             return cname.equals(that.cname) &&
-                    sname.equals(that.sname);
+                    sname.equals(that.sname) &&
+                    Objects.equals(user, that.user) &&
+                    Arrays.equals(userSvcTicketEnc, that.userSvcTicketEnc);
         }
         public int hashCode() {
-            return cname.hashCode() + sname.hashCode();
+            return cname.hashCode() + sname.hashCode() +
+                    Objects.hashCode(user) +
+                    Arrays.hashCode(userSvcTicketEnc);
         }
     }
 
@@ -84,7 +100,8 @@
 
     /*
      * Add a new referral entry to the cache, including: client principal,
-     * service principal, source KDC realm, destination KDC realm and
+     * service principal, user principal (S4U2Self only), client service
+     * ticket (S4U2Proxy only), source KDC realm, destination KDC realm and
      * referral TGT.
      *
      * If a loop is generated when adding the new referral, the first hop is
@@ -94,8 +111,12 @@
      * REALM-1.COM -> REALM-2.COM referral entry is removed from the cache.
      */
     static synchronized void put(PrincipalName cname, PrincipalName service,
-            String fromRealm, String toRealm, Credentials creds) {
-        ReferralCacheKey k = new ReferralCacheKey(cname, service);
+            PrincipalName user, Ticket[] userSvcTickets, String fromRealm,
+            String toRealm, Credentials creds) {
+        Ticket userSvcTicket = (userSvcTickets != null ?
+                userSvcTickets[0] : null);
+        ReferralCacheKey k = new ReferralCacheKey(cname, service,
+                user, userSvcTicket);
         pruneExpired(k);
         if (creds.getEndTime().before(new Date())) {
             return;
@@ -125,11 +146,16 @@
 
     /*
      * Obtain a referral entry from the cache given a client principal,
-     * service principal and a source KDC realm.
+     * a service principal, a user principal (S4U2Self only), a client
+     * service ticket (S4U2Proxy only) and a source KDC realm.
      */
     static synchronized ReferralCacheEntry get(PrincipalName cname,
-            PrincipalName service, String fromRealm) {
-        ReferralCacheKey k = new ReferralCacheKey(cname, service);
+            PrincipalName service, PrincipalName user,
+            Ticket[] userSvcTickets, String fromRealm) {
+        Ticket userSvcTicket = (userSvcTickets != null ?
+                userSvcTickets[0] : null);
+        ReferralCacheKey k = new ReferralCacheKey(cname, service,
+                user, userSvcTicket);
         pruneExpired(k);
         Map<String, ReferralCacheEntry> entries = referralsMap.get(k);
         if (entries != null) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11AEADCipher.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11AEADCipher.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11AEADCipher.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11AEADCipher.java	2021-09-01 14:33:15.000000000 +0000
@@ -388,9 +388,6 @@
 
         long p11KeyID = p11Key.getKeyID();
         try {
-            if (session == null) {
-                session = token.getOpSession();
-            }
             CK_MECHANISM mechWithParams;
             switch (blockMode) {
                 case MODE_GCM:
@@ -400,6 +397,9 @@
                 default:
                     throw new ProviderException("Unsupported mode: " + blockMode);
             }
+            if (session == null) {
+                session = token.getOpSession();
+            }
             if (encrypt) {
                 token.p11.C_EncryptInit(session.id(), mechWithParams,
                     p11KeyID);
@@ -408,7 +408,6 @@
                     p11KeyID);
             }
         } catch (PKCS11Exception e) {
-            //e.printStackTrace();
             p11Key.releaseKeyID();
             session = token.releaseSession(session);
             throw e;
@@ -743,7 +742,9 @@
                    errorCode == CKR_ENCRYPTED_DATA_LEN_RANGE) {
             throw (IllegalBlockSizeException)
                     (new IllegalBlockSizeException(e.toString()).initCause(e));
-        } else if (errorCode == CKR_ENCRYPTED_DATA_INVALID) {
+        } else if (errorCode == CKR_ENCRYPTED_DATA_INVALID ||
+                // Solaris-specific
+                errorCode == CKR_GENERAL_ERROR) {
             throw (BadPaddingException)
                     (new BadPaddingException(e.toString()).initCause(e));
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Cipher.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Cipher.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Cipher.java	2021-09-01 14:33:15.000000000 +0000
@@ -70,7 +70,7 @@
     private static interface Padding {
         // ENC: format the specified buffer with padding bytes and return the
         // actual padding length
-        int setPaddingBytes(byte[] paddingBuffer, int padLen);
+        int setPaddingBytes(byte[] paddingBuffer, int startOff, int padLen);
 
         // DEC: return the length of trailing padding bytes given the specified
         // padded data
@@ -91,8 +91,8 @@
             this.blockSize = blockSize;
         }
 
-        public int setPaddingBytes(byte[] paddingBuffer, int padLen) {
-            Arrays.fill(paddingBuffer, 0, padLen, (byte) (padLen & 0x007f));
+        public int setPaddingBytes(byte[] paddingBuffer, int startOff, int padLen) {
+            Arrays.fill(paddingBuffer, startOff, startOff + padLen, (byte) (padLen & 0x007f));
             return padLen;
         }
 
@@ -169,6 +169,14 @@
     // specification mandates a fixed size of the key
     private int fixedKeySize = -1;
 
+    // Indicates whether the underlying PKCS#11 library requires block-sized
+    // updates during multi-part operations. In such case, we buffer data in
+    // padBuffer up to a block-size. This may be needed only if padding is
+    // applied on the Java side. An example of the previous is when the
+    // CKM_AES_ECB mechanism is used and the PKCS#11 library is NSS. See more
+    // on JDK-8261355.
+    private boolean reqBlockUpdates = false;
+
     P11Cipher(Token token, String algorithm, long mechanism)
             throws PKCS11Exception, NoSuchAlgorithmException {
         super();
@@ -252,6 +260,10 @@
                 // no native padding support; use our own padding impl
                 paddingObj = new PKCS5Padding(blockSize);
                 padBuffer = new byte[blockSize];
+                char[] tokenLabel = token.tokenInfo.label;
+                // NSS requires block-sized updates in multi-part operations.
+                reqBlockUpdates = ((tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
+                        && tokenLabel[2] == 'S') ? true : false);
             }
         } else {
             throw new NoSuchPaddingException("Unsupported padding " + padding);
@@ -587,46 +599,54 @@
         try {
             ensureInitialized();
             int k = 0;
-            if (encrypt) {
-                k = token.p11.C_EncryptUpdate(session.id(), 0, in, inOfs, inLen,
-                        0, out, outOfs, outLen);
-            } else {
-                int newPadBufferLen = 0;
-                if (paddingObj != null) {
-                    if (padBufferLen != 0) {
-                        // NSS throws up when called with data not in multiple
-                        // of blocks. Try to work around this by holding the
-                        // extra data in padBuffer.
-                        if (padBufferLen != padBuffer.length) {
-                            int bufCapacity = padBuffer.length - padBufferLen;
-                            if (inLen > bufCapacity) {
-                                bufferInputBytes(in, inOfs, bufCapacity);
-                                inOfs += bufCapacity;
-                                inLen -= bufCapacity;
-                            } else {
-                                bufferInputBytes(in, inOfs, inLen);
-                                return 0;
-                            }
+            int newPadBufferLen = 0;
+            if (paddingObj != null && (!encrypt || reqBlockUpdates)) {
+                if (padBufferLen != 0) {
+                    if (padBufferLen != padBuffer.length) {
+                        int bufCapacity = padBuffer.length - padBufferLen;
+                        if (inLen > bufCapacity) {
+                            bufferInputBytes(in, inOfs, bufCapacity);
+                            inOfs += bufCapacity;
+                            inLen -= bufCapacity;
+                        } else {
+                            bufferInputBytes(in, inOfs, inLen);
+                            return 0;
                         }
+                    }
+                    if (encrypt) {
+                        k = token.p11.C_EncryptUpdate(session.id(),
+                                0, padBuffer, 0, padBufferLen,
+                                0, out, outOfs, outLen);
+                    } else {
                         k = token.p11.C_DecryptUpdate(session.id(),
                                 0, padBuffer, 0, padBufferLen,
                                 0, out, outOfs, outLen);
-                        padBufferLen = 0;
                     }
-                    newPadBufferLen = inLen & (blockSize - 1);
-                    if (newPadBufferLen == 0) {
-                        newPadBufferLen = padBuffer.length;
-                    }
-                    inLen -= newPadBufferLen;
+                    padBufferLen = 0;
                 }
-                if (inLen > 0) {
+                newPadBufferLen = inLen & (blockSize - 1);
+                if (!encrypt && newPadBufferLen == 0) {
+                    // While decrypting with implUpdate, the last encrypted block
+                    // is always held in a buffer. If it's the final one (unknown
+                    // at this point), it may contain padding bytes and need further
+                    // processing. In implDoFinal (where we know it's the final one)
+                    // the buffer is decrypted, unpadded and returned.
+                    newPadBufferLen = padBuffer.length;
+                }
+                inLen -= newPadBufferLen;
+            }
+            if (inLen > 0) {
+                if (encrypt) {
+                    k += token.p11.C_EncryptUpdate(session.id(), 0, in, inOfs,
+                            inLen, 0, out, (outOfs + k), (outLen - k));
+                } else {
                     k += token.p11.C_DecryptUpdate(session.id(), 0, in, inOfs,
                             inLen, 0, out, (outOfs + k), (outLen - k));
                 }
-                // update 'padBuffer' if using our own padding impl.
-                if (paddingObj != null) {
-                    bufferInputBytes(in, inOfs + inLen, newPadBufferLen);
-                }
+            }
+            // update 'padBuffer' if using our own padding impl.
+            if (paddingObj != null && newPadBufferLen > 0) {
+                bufferInputBytes(in, inOfs + inLen, newPadBufferLen);
             }
             bytesBuffered += (inLen - k);
             return k;
@@ -687,60 +707,62 @@
             }
 
             int k = 0;
-            if (encrypt) {
-                if (inAddr == 0 && inArray == null) {
-                    inArray = new byte[inLen];
-                    inBuffer.get(inArray);
-                } else {
-                    inBuffer.position(origPos + inLen);
-                }
-                k = token.p11.C_EncryptUpdate(session.id(),
-                        inAddr, inArray, inOfs, inLen,
-                        outAddr, outArray, outOfs, outLen);
-            } else {
-                int newPadBufferLen = 0;
-                if (paddingObj != null) {
-                    if (padBufferLen != 0) {
-                        // NSS throws up when called with data not in multiple
-                        // of blocks. Try to work around this by holding the
-                        // extra data in padBuffer.
-                        if (padBufferLen != padBuffer.length) {
-                            int bufCapacity = padBuffer.length - padBufferLen;
-                            if (inLen > bufCapacity) {
-                                bufferInputBytes(inBuffer, bufCapacity);
-                                inOfs += bufCapacity;
-                                inLen -= bufCapacity;
-                            } else {
-                                bufferInputBytes(inBuffer, inLen);
-                                return 0;
-                            }
+            int newPadBufferLen = 0;
+            if (paddingObj != null  && (!encrypt || reqBlockUpdates)) {
+                if (padBufferLen != 0) {
+                    if (padBufferLen != padBuffer.length) {
+                        int bufCapacity = padBuffer.length - padBufferLen;
+                        if (inLen > bufCapacity) {
+                            bufferInputBytes(inBuffer, bufCapacity);
+                            inOfs += bufCapacity;
+                            inLen -= bufCapacity;
+                        } else {
+                            bufferInputBytes(inBuffer, inLen);
+                            return 0;
                         }
+                    }
+                    if (encrypt) {
+                        k = token.p11.C_EncryptUpdate(session.id(), 0,
+                                padBuffer, 0, padBufferLen, outAddr, outArray,
+                                outOfs, outLen);
+                    } else {
                         k = token.p11.C_DecryptUpdate(session.id(), 0,
                                 padBuffer, 0, padBufferLen, outAddr, outArray,
                                 outOfs, outLen);
-                        padBufferLen = 0;
-                    }
-                    newPadBufferLen = inLen & (blockSize - 1);
-                    if (newPadBufferLen == 0) {
-                        newPadBufferLen = padBuffer.length;
                     }
-                    inLen -= newPadBufferLen;
+                    padBufferLen = 0;
                 }
-                if (inLen > 0) {
-                    if (inAddr == 0 && inArray == null) {
-                        inArray = new byte[inLen];
-                        inBuffer.get(inArray);
-                    } else {
-                        inBuffer.position(inBuffer.position() + inLen);
-                    }
+                newPadBufferLen = inLen & (blockSize - 1);
+                if (!encrypt && newPadBufferLen == 0) {
+                    // While decrypting with implUpdate, the last encrypted block
+                    // is always held in a buffer. If it's the final one (unknown
+                    // at this point), it may contain padding bytes and need further
+                    // processing. In implDoFinal (where we know it's the final one)
+                    // the buffer is decrypted, unpadded and returned.
+                    newPadBufferLen = padBuffer.length;
+                }
+                inLen -= newPadBufferLen;
+            }
+            if (inLen > 0) {
+                if (inAddr == 0 && inArray == null) {
+                    inArray = new byte[inLen];
+                    inBuffer.get(inArray);
+                } else {
+                    inBuffer.position(inBuffer.position() + inLen);
+                }
+                if (encrypt) {
+                    k += token.p11.C_EncryptUpdate(session.id(), inAddr,
+                            inArray, inOfs, inLen, outAddr, outArray,
+                            (outOfs + k), (outLen - k));
+                } else {
                     k += token.p11.C_DecryptUpdate(session.id(), inAddr,
                             inArray, inOfs, inLen, outAddr, outArray,
                             (outOfs + k), (outLen - k));
                 }
-                // update 'padBuffer' if using our own padding impl.
-                if (paddingObj != null && newPadBufferLen != 0) {
-                    bufferInputBytes(inBuffer, newPadBufferLen);
-                }
+            }
+            // update 'padBuffer' if using our own padding impl.
+            if (paddingObj != null && newPadBufferLen > 0) {
+                bufferInputBytes(inBuffer, newPadBufferLen);
             }
             bytesBuffered += (inLen - k);
             if (!(outBuffer instanceof DirectBuffer) &&
@@ -779,10 +801,14 @@
             int k = 0;
             if (encrypt) {
                 if (paddingObj != null) {
+                    int startOff = 0;
+                    if (reqBlockUpdates) {
+                        startOff = padBufferLen;
+                    }
                     int actualPadLen = paddingObj.setPaddingBytes(padBuffer,
-                            requiredOutLen - bytesBuffered);
+                            startOff, requiredOutLen - bytesBuffered);
                     k = token.p11.C_EncryptUpdate(session.id(),
-                            0, padBuffer, 0, actualPadLen,
+                            0, padBuffer, 0, startOff + actualPadLen,
                             0, out, outOfs, outLen);
                 }
                 // Some implementations such as the NSS Software Token do not
@@ -863,10 +889,14 @@
 
             if (encrypt) {
                 if (paddingObj != null) {
+                    int startOff = 0;
+                    if (reqBlockUpdates) {
+                        startOff = padBufferLen;
+                    }
                     int actualPadLen = paddingObj.setPaddingBytes(padBuffer,
-                            requiredOutLen - bytesBuffered);
+                            startOff, requiredOutLen - bytesBuffered);
                     k = token.p11.C_EncryptUpdate(session.id(),
-                            0, padBuffer, 0, actualPadLen,
+                            0, padBuffer, 0, startOff + actualPadLen,
                             outAddr, outArray, outOfs, outLen);
                 }
                 // Some implementations such as the NSS Software Token do not
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Digest.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Digest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Digest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Digest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -103,9 +103,11 @@
             digestLength = 20;
             break;
         case (int)CKM_SHA224:
+        case (int)CKM_SHA512_224:
             digestLength = 28;
             break;
         case (int)CKM_SHA256:
+        case (int)CKM_SHA512_256:
             digestLength = 32;
             break;
         case (int)CKM_SHA384:
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Mac.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Mac.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Mac.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/P11Mac.java	2021-09-01 14:33:15.000000000 +0000
@@ -91,9 +91,11 @@
             macLength = 20;
             break;
         case (int)CKM_SHA224_HMAC:
+        case (int)CKM_SHA512_224_HMAC:
             macLength = 28;
             break;
         case (int)CKM_SHA256_HMAC:
+        case (int)CKM_SHA512_256_HMAC:
             macLength = 32;
             break;
         case (int)CKM_SHA384_HMAC:
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/Secmod.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/Secmod.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/Secmod.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/Secmod.java	2021-09-01 14:33:15.000000000 +0000
@@ -73,6 +73,15 @@
 
     private final static String TRUST_LIB_NAME = "nssckbi";
 
+    // Slot IDs - defined in j2secmod.h on the native side
+    // Values obtained from NSS's pkcs11i.h header
+
+    private final static int NETSCAPE_SLOT_ID = 0x1;
+
+    private final static int PRIVATE_KEY_SLOT_ID = 0x2;
+
+    private final static int FIPS_SLOT_ID = 0x3;
+
     // handle to be passed to the native code, 0 means not initialized
     private long nssHandle;
 
@@ -392,20 +401,21 @@
         private Map<Bytes,TrustAttributes> trust;
 
         Module(String libraryDir, String libraryName, String commonName,
-                boolean fips, int slot) {
+                int slotIndex, int slotId) {
             ModuleType type;
 
             if ((libraryName == null) || (libraryName.length() == 0)) {
                 // must be softtoken
                 libraryName = System.mapLibraryName(SOFTTOKEN_LIB_NAME);
-                if (fips == false) {
-                    type = (slot == 0) ? ModuleType.CRYPTO : ModuleType.KEYSTORE;
-                } else {
+                if (slotId == NETSCAPE_SLOT_ID) {
+                    type = ModuleType.CRYPTO;
+                } else if (slotId == PRIVATE_KEY_SLOT_ID) {
+                    type = ModuleType.KEYSTORE;
+                } else if (slotId == FIPS_SLOT_ID) {
                     type = ModuleType.FIPS;
-                    if (slot != 0) {
-                        throw new RuntimeException
-                            ("Slot index should be 0 for FIPS slot");
-                    }
+                } else {
+                    throw new RuntimeException("Unexpected slot ID " + slotId +
+                            " in the NSS Internal Module");
                 }
             } else {
                 if (libraryName.endsWith(System.mapLibraryName(TRUST_LIB_NAME))
@@ -426,7 +436,7 @@
             }
             this.libraryName = libraryFile.getPath();
             this.commonName = commonName;
-            this.slot = slot;
+            this.slot = slotIndex;
             this.type = type;
             initConfiguration();
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/Functions.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/Functions.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/Functions.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -54,7 +54,7 @@
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
 
 /**
- * This class contains onyl static methods. It is the place for all functions
+ * This class contains only static methods. It is the place for all functions
  * that are used by several classes in this package.
  *
  * @author Karl Scheibelhofer <Karl.Scheibelhofer@iaik.at>
@@ -350,6 +350,12 @@
 
     private static final Flags mechanismInfoFlags = new Flags(new long[] {
         CKF_HW,
+        CKF_MESSAGE_ENCRYPT,
+        CKF_MESSAGE_DECRYPT,
+        CKF_MESSAGE_SIGN,
+        CKF_MESSAGE_VERIFY,
+        CKF_MULTI_MESSAGE,
+        CKF_FIND_OBJECTS,
         CKF_ENCRYPT,
         CKF_DECRYPT,
         CKF_DIGEST,
@@ -365,12 +371,19 @@
         CKF_EC_F_P,
         CKF_EC_F_2M,
         CKF_EC_ECPARAMETERS,
-        CKF_EC_NAMEDCURVE,
+        CKF_EC_OID,
         CKF_EC_UNCOMPRESS,
         CKF_EC_COMPRESS,
+        CKF_EC_CURVENAME,
         CKF_EXTENSION,
     }, new String[] {
         "CKF_HW",
+        "CKF_MESSAGE_ENCRYPT",
+        "CKF_MESSAGE_DECRYPT",
+        "CKF_MESSAGE_SIGN",
+        "CKF_MESSAGE_VERIFY",
+        "CKF_MULTI_MESSAGE",
+        "CKF_FIND_OBJECTS",
         "CKF_ENCRYPT",
         "CKF_DECRYPT",
         "CKF_DIGEST",
@@ -386,9 +399,10 @@
         "CKF_EC_F_P",
         "CKF_EC_F_2M",
         "CKF_EC_ECPARAMETERS",
-        "CKF_EC_NAMEDCURVE",
+        "CKF_EC_OID",
         "CKF_EC_UNCOMPRESS",
         "CKF_EC_COMPRESS",
+        "CKF_EC_CURVENAME",
         "CKF_EXTENSION",
     });
 
@@ -624,6 +638,7 @@
         addMapping(mgfNames, mgfIds, id, name);
     }
 
+    // The ordering here follows the PKCS11Constants class
     static {
         addMech(CKM_RSA_PKCS_KEY_PAIR_GEN,      "CKM_RSA_PKCS_KEY_PAIR_GEN");
         addMech(CKM_RSA_PKCS,                   "CKM_RSA_PKCS");
@@ -647,6 +662,10 @@
         addMech(CKM_DSA_SHA256,                 "CKM_DSA_SHA256");
         addMech(CKM_DSA_SHA384,                 "CKM_DSA_SHA384");
         addMech(CKM_DSA_SHA512,                 "CKM_DSA_SHA512");
+        addMech(CKM_DSA_SHA3_224,               "CKM_DSA_SHA3_224");
+        addMech(CKM_DSA_SHA3_256,               "CKM_DSA_SHA3_256");
+        addMech(CKM_DSA_SHA3_384,               "CKM_DSA_SHA3_384");
+        addMech(CKM_DSA_SHA3_512,               "CKM_DSA_SHA3_512");
 
         addMech(CKM_DH_PKCS_KEY_PAIR_GEN,       "CKM_DH_PKCS_KEY_PAIR_GEN");
         addMech(CKM_DH_PKCS_DERIVE,             "CKM_DH_PKCS_DERIVE");
@@ -664,6 +683,28 @@
         addMech(CKM_SHA224_RSA_PKCS,            "CKM_SHA224_RSA_PKCS");
         addMech(CKM_SHA224_RSA_PKCS_PSS,        "CKM_SHA224_RSA_PKCS_PSS");
 
+        addMech(CKM_SHA512_224,                 "CKM_SHA512_224");
+        addMech(CKM_SHA512_224_HMAC,            "CKM_SHA512_224_HMAC");
+        addMech(CKM_SHA512_224_HMAC_GENERAL,    "CKM_SHA512_224_HMAC_GENERAL");
+        addMech(CKM_SHA512_224_KEY_DERIVATION,  "CKM_SHA512_224_KEY_DERIVATION");
+        addMech(CKM_SHA512_256,                 "CKM_SHA512_256");
+        addMech(CKM_SHA512_256_HMAC,            "CKM_SHA512_256_HMAC");
+        addMech(CKM_SHA512_256_HMAC_GENERAL,    "CKM_SHA512_256_HMAC_GENERAL");
+        addMech(CKM_SHA512_256_KEY_DERIVATION,  "CKM_SHA512_256_KEY_DERIVATION");
+        addMech(CKM_SHA512_T,                   "CKM_SHA512_T");
+        addMech(CKM_SHA512_T_HMAC,              "CKM_SHA512_T_HMAC");
+        addMech(CKM_SHA512_T_HMAC_GENERAL,      "CKM_SHA512_T_HMAC_GENERAL");
+        addMech(CKM_SHA512_T_KEY_DERIVATION,    "CKM_SHA512_T_KEY_DERIVATION");
+
+        addMech(CKM_SHA3_256_RSA_PKCS,          "CKM_SHA3_256_RSA_PKCS");
+        addMech(CKM_SHA3_384_RSA_PKCS,          "CKM_SHA3_384_RSA_PKCS");
+        addMech(CKM_SHA3_512_RSA_PKCS,          "CKM_SHA3_512_RSA_PKCS");
+        addMech(CKM_SHA3_256_RSA_PKCS_PSS,      "CKM_SHA3_256_RSA_PKCS_PSS");
+        addMech(CKM_SHA3_384_RSA_PKCS_PSS,      "CKM_SHA3_384_RSA_PKCS_PSS");
+        addMech(CKM_SHA3_512_RSA_PKCS_PSS,      "CKM_SHA3_512_RSA_PKCS_PSS");
+        addMech(CKM_SHA3_224_RSA_PKCS,          "CKM_SHA3_224_RSA_PKCS");
+        addMech(CKM_SHA3_224_RSA_PKCS_PSS,      "CKM_SHA3_224_RSA_PKCS_PSS");
+
         addMech(CKM_RC2_KEY_GEN,                "CKM_RC2_KEY_GEN");
         addMech(CKM_RC2_ECB,                    "CKM_RC2_ECB");
         addMech(CKM_RC2_CBC,                    "CKM_RC2_CBC");
@@ -715,30 +756,18 @@
         addMech(CKM_RIPEMD160,                  "CKM_RIPEMD160");
         addMech(CKM_RIPEMD160_HMAC,             "CKM_RIPEMD160_HMAC");
         addMech(CKM_RIPEMD160_HMAC_GENERAL,     "CKM_RIPEMD160_HMAC_GENERAL");
-        addMech(CKM_SHA224,                     "CKM_SHA224");
-        addMech(CKM_SHA224_HMAC,                "CKM_SHA224_HMAC");
-        addMech(CKM_SHA224_HMAC_GENERAL,        "CKM_SHA224_HMAC_GENERAL");
         addMech(CKM_SHA256,                     "CKM_SHA256");
         addMech(CKM_SHA256_HMAC,                "CKM_SHA256_HMAC");
         addMech(CKM_SHA256_HMAC_GENERAL,        "CKM_SHA256_HMAC_GENERAL");
+        addMech(CKM_SHA224,                     "CKM_SHA224");
+        addMech(CKM_SHA224_HMAC,                "CKM_SHA224_HMAC");
+        addMech(CKM_SHA224_HMAC_GENERAL,        "CKM_SHA224_HMAC_GENERAL");
         addMech(CKM_SHA384,                     "CKM_SHA384");
         addMech(CKM_SHA384_HMAC,                "CKM_SHA384_HMAC");
         addMech(CKM_SHA384_HMAC_GENERAL,        "CKM_SHA384_HMAC_GENERAL");
         addMech(CKM_SHA512,                     "CKM_SHA512");
         addMech(CKM_SHA512_HMAC,                "CKM_SHA512_HMAC");
         addMech(CKM_SHA512_HMAC_GENERAL,        "CKM_SHA512_HMAC_GENERAL");
-        addMech(CKM_SHA512_224,                 "CKM_SHA512_224");
-        addMech(CKM_SHA512_224_HMAC,            "CKM_SHA512_224_HMAC");
-        addMech(CKM_SHA512_224_HMAC_GENERAL,    "CKM_SHA512_224_HMAC_GENERAL");
-        addMech(CKM_SHA512_224_KEY_DERIVATION,  "CKM_SHA512_224_KEY_DERIVATION");
-        addMech(CKM_SHA512_256,                 "CKM_SHA512_256");
-        addMech(CKM_SHA512_256_HMAC,            "CKM_SHA512_256_HMAC");
-        addMech(CKM_SHA512_256_HMAC_GENERAL,    "CKM_SHA512_256_HMAC_GENERAL");
-        addMech(CKM_SHA512_256_KEY_DERIVATION,  "CKM_SHA512_256_KEY_DERIVATION");
-        addMech(CKM_SHA512_T,                   "CKM_SHA512_T");
-        addMech(CKM_SHA512_T_HMAC,              "CKM_SHA512_T_HMAC");
-        addMech(CKM_SHA512_T_HMAC_GENERAL,      "CKM_SHA512_T_HMAC_GENERAL");
-        addMech(CKM_SHA512_T_KEY_DERIVATION,    "CKM_SHA512_T_KEY_DERIVATION");
 
         addMech(CKM_SECURID_KEY_GEN,            "CKM_SECURID_KEY_GEN");
         addMech(CKM_SECURID,                    "CKM_SECURID");
@@ -747,6 +776,23 @@
         addMech(CKM_ACTI,                       "CKM_ACTI");
         addMech(CKM_ACTI_KEY_GEN,               "CKM_ACTI_KEY_GEN");
 
+        addMech(CKM_SHA3_256,                   "CKM_SHA3_256");
+        addMech(CKM_SHA3_256_HMAC,              "CKM_SHA3_256_HMAC");
+        addMech(CKM_SHA3_256_HMAC_GENERAL,      "CKM_SHA3_256_HMAC_GENERAL");
+        addMech(CKM_SHA3_256_KEY_GEN,           "CKM_SHA3_256_KEY_GEN");
+        addMech(CKM_SHA3_224,                   "CKM_SHA3_224");
+        addMech(CKM_SHA3_224_HMAC,              "CKM_SHA3_224_HMAC");
+        addMech(CKM_SHA3_224_HMAC_GENERAL,      "CKM_SHA3_224_HMAC_GENERAL");
+        addMech(CKM_SHA3_224_KEY_GEN,           "CKM_SHA3_224_KEY_GEN");
+        addMech(CKM_SHA3_384,                   "CKM_SHA3_384");
+        addMech(CKM_SHA3_384_HMAC,              "CKM_SHA3_384_HMAC");
+        addMech(CKM_SHA3_384_HMAC_GENERAL,      "CKM_SHA3_384_HMAC_GENERAL");
+        addMech(CKM_SHA3_384_KEY_GEN,           "CKM_SHA3_384_KEY_GEN");
+        addMech(CKM_SHA3_512,                   "CKM_SHA3_512");
+        addMech(CKM_SHA3_512_HMAC,              "CKM_SHA3_512_HMAC");
+        addMech(CKM_SHA3_512_HMAC_GENERAL,      "CKM_SHA3_512_HMAC_GENERAL");
+        addMech(CKM_SHA3_512_KEY_GEN,           "CKM_SHA3_512_KEY_GEN");
+
         addMech(CKM_CAST_KEY_GEN,               "CKM_CAST_KEY_GEN");
         addMech(CKM_CAST_ECB,                   "CKM_CAST_ECB");
         addMech(CKM_CAST_CBC,                   "CKM_CAST_CBC");
@@ -798,10 +844,17 @@
         addMech(CKM_MD5_KEY_DERIVATION,         "CKM_MD5_KEY_DERIVATION");
         addMech(CKM_MD2_KEY_DERIVATION,         "CKM_MD2_KEY_DERIVATION");
         addMech(CKM_SHA1_KEY_DERIVATION,        "CKM_SHA1_KEY_DERIVATION");
-        addMech(CKM_SHA224_KEY_DERIVATION,      "CKM_SHA224_KEY_DERIVATION");
         addMech(CKM_SHA256_KEY_DERIVATION,      "CKM_SHA256_KEY_DERIVATION");
         addMech(CKM_SHA384_KEY_DERIVATION,      "CKM_SHA384_KEY_DERIVATION");
         addMech(CKM_SHA512_KEY_DERIVATION,      "CKM_SHA512_KEY_DERIVATION");
+        addMech(CKM_SHA224_KEY_DERIVATION,      "CKM_SHA224_KEY_DERIVATION");
+        addMech(CKM_SHA3_256_KEY_DERIVATION,    "CKM_SHA3_256_KEY_DERIVATION");
+        addMech(CKM_SHA3_224_KEY_DERIVATION,    "CKM_SHA3_224_KEY_DERIVATION");
+        addMech(CKM_SHA3_384_KEY_DERIVATION,    "CKM_SHA3_384_KEY_DERIVATION");
+        addMech(CKM_SHA3_512_KEY_DERIVATION,    "CKM_SHA3_512_KEY_DERIVATION");
+        addMech(CKM_SHAKE_128_KEY_DERIVATION,   "CKM_SHAKE_128_KEY_DERIVATION");
+        addMech(CKM_SHAKE_256_KEY_DERIVATION,   "CKM_SHAKE_256_KEY_DERIVATION");
+
         addMech(CKM_PBE_MD2_DES_CBC,            "CKM_PBE_MD2_DES_CBC");
         addMech(CKM_PBE_MD5_DES_CBC,            "CKM_PBE_MD5_DES_CBC");
         addMech(CKM_PBE_MD5_CAST_CBC,           "CKM_PBE_MD5_CAST_CBC");
@@ -894,18 +947,29 @@
         addMech(CKM_BATON_SHUFFLE,              "CKM_BATON_SHUFFLE");
         addMech(CKM_BATON_WRAP,                 "CKM_BATON_WRAP");
         addMech(CKM_EC_KEY_PAIR_GEN,            "CKM_EC_KEY_PAIR_GEN");
+        addMech(CKM_EC_KEY_PAIR_GEN_W_EXTRA_BITS,
+                                            "CKM_EC_KEY_PAIR_GEN_W_EXTRA_BITS");
+
         addMech(CKM_ECDSA,                      "CKM_ECDSA");
         addMech(CKM_ECDSA_SHA1,                 "CKM_ECDSA_SHA1");
         addMech(CKM_ECDSA_SHA224,               "CKM_ECDSA_SHA224");
         addMech(CKM_ECDSA_SHA256,               "CKM_ECDSA_SHA256");
         addMech(CKM_ECDSA_SHA384,               "CKM_ECDSA_SHA384");
         addMech(CKM_ECDSA_SHA512,               "CKM_ECDSA_SHA512");
+        addMech(CKM_ECDSA_SHA3_224,             "CKM_ECDSA_SHA3_224");
+        addMech(CKM_ECDSA_SHA3_256,             "CKM_ECDSA_SHA3_256");
+        addMech(CKM_ECDSA_SHA3_384,             "CKM_ECDSA_SHA3_384");
+        addMech(CKM_ECDSA_SHA3_512,             "CKM_ECDSA_SHA3_512");
 
         addMech(CKM_ECDH1_DERIVE,               "CKM_ECDH1_DERIVE");
         addMech(CKM_ECDH1_COFACTOR_DERIVE,      "CKM_ECDH1_COFACTOR_DERIVE");
         addMech(CKM_ECMQV_DERIVE,               "CKM_ECMQV_DERIVE");
         addMech(CKM_ECDH_AES_KEY_WRAP,          "CKM_ECDH_AES_KEY_WRAP");
         addMech(CKM_RSA_AES_KEY_WRAP,           "CKM_RSA_AES_KEY_WRAP");
+        addMech(CKM_EC_EDWARDS_KEY_PAIR_GEN,    "CKM_EC_EDWARDS_KEY_PAIR_GEN");
+        addMech(CKM_EC_MONTGOMERY_KEY_PAIR_GEN,
+                                            "CKM_EC_MONTGOMERY_KEY_PAIR_GEN");
+        addMech(CKM_EDDSA,                      "CKM_EDDSA");
 
         addMech(CKM_JUNIPER_KEY_GEN,            "CKM_JUNIPER_KEY_GEN");
         addMech(CKM_JUNIPER_ECB128,             "CKM_JUNIPER_ECB128");
@@ -914,6 +978,9 @@
         addMech(CKM_JUNIPER_SHUFFLE,            "CKM_JUNIPER_SHUFFLE");
         addMech(CKM_JUNIPER_WRAP,               "CKM_JUNIPER_WRAP");
         addMech(CKM_FASTHASH,                   "CKM_FASTHASH");
+        addMech(CKM_AES_XTS,                    "CKM_AES_XTS");
+        addMech(CKM_AES_XTS_KEY_GEN,            "CKM_AES_XTS_KEY_GEN");
+
         addMech(CKM_AES_KEY_GEN,                "CKM_AES_KEY_GEN");
         addMech(CKM_AES_ECB,                    "CKM_AES_ECB");
         addMech(CKM_AES_CBC,                    "CKM_AES_CBC");
@@ -956,6 +1023,10 @@
         addMech(CKM_GOST28147,                  "CKM_GOST28147");
         addMech(CKM_GOST28147_MAC,              "CKM_GOST28147_MAC");
         addMech(CKM_GOST28147_KEY_WRAP,         "CKM_GOST28147_KEY_WRAP");
+        addMech(CKM_CHACHA20_KEY_GEN,           "CKM_CHACHA20_KEY_GEN");
+        addMech(CKM_CHACHA20,                   "CKM_CHACHA20");
+        addMech(CKM_POLY1305_KEY_GEN,           "CKM_POLY1305_KEY_GEN");
+        addMech(CKM_POLY1305,                   "CKM_POLY1305");
 
         addMech(CKM_DSA_PARAMETER_GEN,          "CKM_DSA_PARAMETER_GEN");
         addMech(CKM_DH_PKCS_PARAMETER_GEN,      "CKM_DH_PKCS_PARAMETER_GEN");
@@ -964,6 +1035,8 @@
                                                 "CKM_DSA_PROBABLISTIC_PARAMETER_GEN");
         addMech(CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN,
                                                 "CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN");
+        addMech(CKM_DSA_FIPS_G_GEN,             "CKM_DSA_FIPS_G_GEN");
+
         addMech(CKM_AES_OFB,                    "CKM_AES_OFB");
         addMech(CKM_AES_CFB64,                  "CKM_AES_CFB64");
         addMech(CKM_AES_CFB8,                   "CKM_AES_CFB8");
@@ -971,9 +1044,56 @@
         addMech(CKM_AES_CFB1,                   "CKM_AES_CFB1");
         addMech(CKM_AES_KEY_WRAP,               "CKM_AES_KEY_WRAP");
         addMech(CKM_AES_KEY_WRAP_PAD,           "CKM_AES_KEY_WRAP_PAD");
-
+        addMech(CKM_AES_KEY_WRAP_KWP,           "CKM_AES_KEY_WRAP_KWP");
         addMech(CKM_RSA_PKCS_TPM_1_1,           "CKM_RSA_PKCS_TPM_1_1");
         addMech(CKM_RSA_PKCS_OAEP_TPM_1_1,      "CKM_RSA_PKCS_OAEP_TPM_1_1");
+        addMech(CKM_SHA_1_KEY_GEN,              "CKM_SHA_1_KEY_GEN");
+        addMech(CKM_SHA224_KEY_GEN,             "CKM_SHA224_KEY_GEN");
+        addMech(CKM_SHA256_KEY_GEN,             "CKM_SHA256_KEY_GEN");
+        addMech(CKM_SHA384_KEY_GEN,             "CKM_SHA384_KEY_GEN");
+        addMech(CKM_SHA512_KEY_GEN,             "CKM_SHA512_KEY_GEN");
+        addMech(CKM_SHA512_224_KEY_GEN,         "CKM_SHA512_224_KEY_GEN");
+        addMech(CKM_SHA512_256_KEY_GEN,         "CKM_SHA512_256_KEY_GEN");
+        addMech(CKM_SHA512_T_KEY_GEN,           "CKM_SHA512_T_KEY_GEN");
+        addMech(CKM_NULL,                       "CKM_NULL");
+        addMech(CKM_BLAKE2B_160,                "CKM_BLAKE2B_160");
+        addMech(CKM_BLAKE2B_160_HMAC,           "CKM_BLAKE2B_160_HMAC");
+        addMech(CKM_BLAKE2B_160_HMAC_GENERAL,   "CKM_BLAKE2B_160_HMAC_GENERAL");
+        addMech(CKM_BLAKE2B_160_KEY_DERIVE,     "CKM_BLAKE2B_160_KEY_DERIVE");
+        addMech(CKM_BLAKE2B_160_KEY_GEN,        "CKM_BLAKE2B_160_KEY_GEN");
+        addMech(CKM_BLAKE2B_256,                "CKM_BLAKE2B_256");
+        addMech(CKM_BLAKE2B_256_HMAC,           "CKM_BLAKE2B_256_HMAC");
+        addMech(CKM_BLAKE2B_256_HMAC_GENERAL,   "CKM_BLAKE2B_256_HMAC_GENERAL");
+        addMech(CKM_BLAKE2B_256_KEY_DERIVE,     "CKM_BLAKE2B_256_KEY_DERIVE");
+        addMech(CKM_BLAKE2B_256_KEY_GEN,        "CKM_BLAKE2B_256_KEY_GEN");
+        addMech(CKM_BLAKE2B_384,                "CKM_BLAKE2B_384");
+        addMech(CKM_BLAKE2B_384_HMAC,           "CKM_BLAKE2B_384_HMAC");
+        addMech(CKM_BLAKE2B_384_HMAC_GENERAL,   "CKM_BLAKE2B_384_HMAC_GENERAL");
+        addMech(CKM_BLAKE2B_384_KEY_DERIVE,     "CKM_BLAKE2B_384_KEY_DERIVE");
+        addMech(CKM_BLAKE2B_384_KEY_GEN,        "CKM_BLAKE2B_384_KEY_GEN");
+        addMech(CKM_BLAKE2B_512,                "CKM_BLAKE2B_512");
+        addMech(CKM_BLAKE2B_512_HMAC,           "CKM_BLAKE2B_512_HMAC");
+        addMech(CKM_BLAKE2B_512_HMAC_GENERAL,   "CKM_BLAKE2B_512_HMAC_GENERAL");
+        addMech(CKM_BLAKE2B_512_KEY_DERIVE,     "CKM_BLAKE2B_512_KEY_DERIVE");
+        addMech(CKM_BLAKE2B_512_KEY_GEN,        "CKM_BLAKE2B_512_KEY_GEN");
+        addMech(CKM_SALSA20,                    "CKM_SALSA20");
+        addMech(CKM_CHACHA20_POLY1305,          "CKM_CHACHA20_POLY1305");
+        addMech(CKM_SALSA20_POLY1305,           "CKM_SALSA20_POLY1305");
+        addMech(CKM_X3DH_INITIALIZE,            "CKM_X3DH_INITIALIZE");
+        addMech(CKM_X3DH_RESPOND,               "CKM_X3DH_RESPOND");
+        addMech(CKM_X2RATCHET_INITIALIZE,       "CKM_X2RATCHET_INITIALIZE");
+        addMech(CKM_X2RATCHET_RESPOND,          "CKM_X2RATCHET_RESPOND");
+        addMech(CKM_X2RATCHET_ENCRYPT,          "CKM_X2RATCHET_ENCRYPT");
+        addMech(CKM_X2RATCHET_DECRYPT,          "CKM_X2RATCHET_DECRYPT");
+        addMech(CKM_XEDDSA,                     "CKM_XEDDSA");
+        addMech(CKM_HKDF_DERIVE,                "CKM_HKDF_DERIVE");
+        addMech(CKM_HKDF_DATA,                  "CKM_HKDF_DATA");
+        addMech(CKM_HKDF_KEY_GEN,               "CKM_HKDF_KEY_GEN");
+        addMech(CKM_SALSA20_KEY_GEN,            "CKM_SALSA20_KEY_GEN");
+        addMech(CKM_SP800_108_COUNTER_KDF,      "CKM_SP800_108_COUNTER_KDF");
+        addMech(CKM_SP800_108_FEEDBACK_KDF,     "CKM_SP800_108_FEEDBACK_KDF");
+        addMech(CKM_SP800_108_DOUBLE_PIPELINE_KDF,
+                                         "CKM_SP800_108_DOUBLE_PIPELINE_KDF");
 
         addMech(CKM_VENDOR_DEFINED,             "CKM_VENDOR_DEFINED");
 
@@ -989,6 +1109,10 @@
         addHashMech(CKM_SHA512,                 "SHA-512", "SHA512");
         addHashMech(CKM_SHA512_224,             "SHA-512/224", "SHA512/224");
         addHashMech(CKM_SHA512_256,             "SHA-512/256", "SHA512/256");
+        addHashMech(CKM_SHA3_224,               "SHA3-224");
+        addHashMech(CKM_SHA3_256,               "SHA3-256");
+        addHashMech(CKM_SHA3_384,               "SHA3-384");
+        addHashMech(CKM_SHA3_512,               "SHA3-512");
 
         addKeyType(CKK_RSA,                     "CKK_RSA");
         addKeyType(CKK_DSA,                     "CKK_DSA");
@@ -1031,6 +1155,27 @@
         addKeyType(CKK_GOSTR3410,               "CKK_GOSTR3410");
         addKeyType(CKK_GOSTR3411,               "CKK_GOSTR3411");
         addKeyType(CKK_GOST28147,               "CKK_GOST28147");
+        addKeyType(CKK_CHACHA20,                "CKK_CHACHA20");
+        addKeyType(CKK_POLY1305,                "CKK_POLY1305");
+        addKeyType(CKK_AES_XTS,                 "CKK_AES_XTS");
+
+        addKeyType(CKK_SHA3_224_HMAC,           "CKK_SHA3_224_HMAC");
+        addKeyType(CKK_SHA3_256_HMAC,           "CKK_SHA3_256_HMAC");
+        addKeyType(CKK_SHA3_384_HMAC,           "CKK_SHA3_384_HMAC");
+        addKeyType(CKK_SHA3_512_HMAC,           "CKK_SHA3_512_HMAC");
+        addKeyType(CKK_BLAKE2B_160_HMAC,        "CKK_BLAKE2B_160_HMAC");
+        addKeyType(CKK_BLAKE2B_256_HMAC,        "CKK_BLAKE2B_256_HMAC");
+        addKeyType(CKK_BLAKE2B_384_HMAC,        "CKK_BLAKE2B_384_HMAC");
+        addKeyType(CKK_BLAKE2B_512_HMAC,        "CKK_BLAKE2B_512_HMAC");
+        addKeyType(CKK_SALSA20,                 "CKK_SALSA20");
+        addKeyType(CKK_X2RATCHET,               "CKK_X2RATCHET");
+        addKeyType(CKK_EC_EDWARDS,              "CKK_EC_EDWARDS");
+        addKeyType(CKK_EC_MONTGOMERY,           "CKK_EC_MONTGOMERY");
+        addKeyType(CKK_HKDF,                    "CKK_HKDF");
+
+        addKeyType(CKK_SHA512_224_HMAC,         "CKK_SHA512_224_HMAC");
+        addKeyType(CKK_SHA512_256_HMAC,         "CKK_SHA512_256_HMAC");
+        addKeyType(CKK_SHA512_T_HMAC,           "CKK_SHA512_T_HMAC");
 
         addKeyType(CKK_VENDOR_DEFINED,          "CKK_VENDOR_DEFINED");
 
@@ -1040,6 +1185,7 @@
         addAttribute(CKA_TOKEN,                 "CKA_TOKEN");
         addAttribute(CKA_PRIVATE,               "CKA_PRIVATE");
         addAttribute(CKA_LABEL,                 "CKA_LABEL");
+        addAttribute(CKA_UNIQUE_ID,             "CKA_UNIQUE_ID");
         addAttribute(CKA_APPLICATION,           "CKA_APPLICATION");
         addAttribute(CKA_VALUE,                 "CKA_VALUE");
         addAttribute(CKA_OBJECT_ID,             "CKA_OBJECT_ID");
@@ -1154,6 +1300,24 @@
         addAttribute(CKA_SUPPORTED_CMS_ATTRIBUTES,
                                                 "CKA_SUPPORTED_CMS_ATTRIBUTES");
         addAttribute(CKA_ALLOWED_MECHANISMS,    "CKA_ALLOWED_MECHANISMS");
+        addAttribute(CKA_PROFILE_ID,            "CKA_PROFILE_ID");
+        addAttribute(CKA_X2RATCHET_BAG,         "CKA_X2RATCHET_BAG");
+        addAttribute(CKA_X2RATCHET_BAGSIZE,     "CKA_X2RATCHET_BAGSIZE");
+        addAttribute(CKA_X2RATCHET_BOBS1STMSG,  "CKA_X2RATCHET_BOBS1STMSG");
+        addAttribute(CKA_X2RATCHET_CKR,         "CKA_X2RATCHET_CKR");
+        addAttribute(CKA_X2RATCHET_CKS,         "CKA_X2RATCHET_CKS");
+        addAttribute(CKA_X2RATCHET_DHP,         "CKA_X2RATCHET_DHP");
+        addAttribute(CKA_X2RATCHET_DHR,         "CKA_X2RATCHET_DHR");
+        addAttribute(CKA_X2RATCHET_DHS,         "CKA_X2RATCHET_DHS");
+        addAttribute(CKA_X2RATCHET_HKR,         "CKA_X2RATCHET_HKR");
+        addAttribute(CKA_X2RATCHET_HKS,         "CKA_X2RATCHET_HKS");
+        addAttribute(CKA_X2RATCHET_ISALICE,     "CKA_X2RATCHET_ISALICE");
+        addAttribute(CKA_X2RATCHET_NHKR,        "CKA_X2RATCHET_NHKR");
+        addAttribute(CKA_X2RATCHET_NHKS,        "CKA_X2RATCHET_NHKS");
+        addAttribute(CKA_X2RATCHET_NR,          "CKA_X2RATCHET_NR");
+        addAttribute(CKA_X2RATCHET_NS,          "CKA_X2RATCHET_NS");
+        addAttribute(CKA_X2RATCHET_PNS,         "CKA_X2RATCHET_PNS");
+        addAttribute(CKA_X2RATCHET_RK,          "CKA_X2RATCHET_RK");
 
         addAttribute(CKA_VENDOR_DEFINED,        "CKA_VENDOR_DEFINED");
         addAttribute(CKA_NETSCAPE_DB,           "CKA_NETSCAPE_DB");
@@ -1172,6 +1336,9 @@
         addObjectClass(CKO_SECRET_KEY,          "CKO_SECRET_KEY");
         addObjectClass(CKO_HW_FEATURE,          "CKO_HW_FEATURE");
         addObjectClass(CKO_DOMAIN_PARAMETERS,   "CKO_DOMAIN_PARAMETERS");
+        addObjectClass(CKO_MECHANISM,           "CKO_MECHANISM");
+        addObjectClass(CKO_OTP_KEY,             "CKO_OTP_KEY");
+        addObjectClass(CKO_PROFILE,             "CKO_PROFILE");
         addObjectClass(CKO_VENDOR_DEFINED,      "CKO_VENDOR_DEFINED");
 
         addObjectClass(PCKO_ANY,                "*");
@@ -1181,6 +1348,10 @@
         addMGF(CKG_MGF1_SHA384,                 "CKG_MGF1_SHA384");
         addMGF(CKG_MGF1_SHA512,                 "CKG_MGF1_SHA512");
         addMGF(CKG_MGF1_SHA224,                 "CKG_MGF1_SHA224");
+        addMGF(CKG_MGF1_SHA3_224,               "CKG_MGF1_SHA3_224");
+        addMGF(CKG_MGF1_SHA3_256,               "CKG_MGF1_SHA3_256");
+        addMGF(CKG_MGF1_SHA3_384,               "CKG_MGF1_SHA3_384");
+        addMGF(CKG_MGF1_SHA3_512,               "CKG_MGF1_SHA3_512");
     }
 
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -48,7 +48,7 @@
 package sun.security.pkcs11.wrapper;
 
 /**
- * This interface holds constants of the PKCS#11 v2.11 standard.
+ * This interface holds constants of the PKCS#11 v3.00 standard.
  * This is mainly the content of the 'pkcs11t.h' header file.
  *
  * Mapping of primitiv data types to Java types:
@@ -62,11 +62,15 @@
  *   CK_ULONG ...................................... long
  *   CK_LONG ....................................... long
  *   CK_FLAGS ...................................... long
+ *   CK_BYTE_PTR ................................... byte[]
+ *   CK_CHAR_PTR ................................... char[]
+ *   CK_UTF8CHAR_PTR ............................... char[]
+ *   CK_ULONG_PTR .................................. long[]
+ *   CK_VOID_PTR ................................... Object[]
  *   CK_NOTIFICATION ............................... long
  *   CK_SLOT_ID .................................... long
  *   CK_SESSION_HANDLE ............................. long
  *   CK_USER_TYPE .................................. long
- *   CK_SESSION_HANDLE ............................. long
  *   CK_STATE ...................................... long
  *   CK_OBJECT_HANDLE .............................. long
  *   CK_OBJECT_CLASS ............................... long
@@ -74,21 +78,27 @@
  *   CK_KEY_TYPE ................................... long
  *   CK_CERTIFICATE_TYPE ........................... long
  *   CK_ATTRIBUTE_TYPE ............................. long
- *   CK_VOID_PTR ................................... Object[]
- *   CK_BYTE_PTR ................................... byte[]
- *   CK_CHAR_PTR ................................... char[]
- *   CK_UTF8CHAR_PTR ............................... char[]
  *   CK_MECHANISM_TYPE ............................. long
  *   CK_RV ......................................... long
- *   CK_RSA_PKCS_OAEP_MGF_TYPE ..................... long
+ *   CK_RSA_PKCS_MGF_TYPE .......................... long
  *   CK_RSA_PKCS_OAEP_SOURCE_TYPE .................. long
+ *   CK_EC_KDF_TYPE ................................ long
+ *   CK_X9_42_DH_KDF_TYPE .......................... long
  *   CK_RC2_PARAMS ................................. long
  *   CK_MAC_GENERAL_PARAMS ......................... long
  *   CK_EXTRACT_PARAMS ............................. long
  *   CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE .... long
  *   CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE .............. long
- *   CK_EC_KDF_TYPE ................................ long
- *   CK_X9_42_DH_KDF_TYPE .......................... long
+ *   CK_OTP_PARAM_TYPE / CK_PARAM_TYPE ............. long
+ *   CK_GENERATOR_FUNCTION ......................... long
+ *   CK_JAVA_MIDP_SECURITY_DOMAIN .................. long
+ *   CK_CERTIFICATE_CATEGORY ....................... long
+ *   CK_PROFILE_ID ................................. long
+ *   CK_PRF_DATA_TYPE .............................. long
+ *   CK_SP800_108_DKM_LENGTH_METHOD ................ long
+ *   CK_X3DH_KDF_TYPE .............................. long
+ *   CK_X2RATCHET_KDF_TYPE ......................... long
+ *   CK_XEDDSA_HASH_TYPE ........................... long
  * </pre>
  *
  * @author <a href="mailto:Karl.Scheibelhofer@iaik.at"> Karl Scheibelhofer </a>
@@ -201,16 +211,30 @@
     public static final long  CKO_SECRET_KEY        = 0x00000004L;
     public static final long  CKO_HW_FEATURE        = 0x00000005L;
     public static final long  CKO_DOMAIN_PARAMETERS = 0x00000006L;
+    public static final long  CKO_MECHANISM         = 0x00000007L;
+    public static final long  CKO_OTP_KEY           = 0x00000008L;
+    public static final long  CKO_PROFILE           = 0x00000009L;
+
     public static final long  CKO_VENDOR_DEFINED    = 0x80000000L;
 
     // pseudo object class ANY (for template manager)
     public static final long  PCKO_ANY              = 0x7FFFFF23L;
 
+    /* Uncomment when actually used
+    // Profile ID's
+    public static final long  CKP_INVALID_ID                = 0x00000000L;
+    public static final long  CKP_BASELINE_PROVIDER         = 0x00000001L;
+    public static final long  CKP_EXTENDED_PROVIDER         = 0x00000002L;
+    public static final long  CKP_AUTHENTICATION_TOKEN      = 0x00000003L;
+    public static final long  CKP_PUBLIC_CERTIFICATES_TOKEN = 0x00000004L;
+    public static final long  CKP_VENDOR_DEFINED            = 0x80000000L;
 
-    /* The following hardware feature types are defined */
+    // The following hardware feature types are defined
     public static final long  CKH_MONOTONIC_COUNTER = 0x00000001L;
     public static final long  CKH_CLOCK             = 0x00000002L;
+    public static final long  CKH_USER_INTERFACE    = 0x00000003L;
     public static final long  CKH_VENDOR_DEFINED    = 0x80000000L;
+    */
 
     /* the following key types are defined: */
     public static final long  CKK_RSA                  = 0x00000000L;
@@ -259,7 +283,29 @@
     public static final long  CKK_GOSTR3410            = 0x00000030L;
     public static final long  CKK_GOSTR3411            = 0x00000031L;
     public static final long  CKK_GOST28147            = 0x00000032L;
-;
+    public static final long  CKK_CHACHA20             = 0x00000033L;
+    public static final long  CKK_POLY1305             = 0x00000034L;
+    public static final long  CKK_AES_XTS              = 0x00000035L;
+
+    public static final long  CKK_SHA3_224_HMAC        = 0x00000036L;
+    public static final long  CKK_SHA3_256_HMAC        = 0x00000037L;
+    public static final long  CKK_SHA3_384_HMAC        = 0x00000038L;
+    public static final long  CKK_SHA3_512_HMAC        = 0x00000039L;
+
+    public static final long  CKK_BLAKE2B_160_HMAC     = 0x0000003aL;
+    public static final long  CKK_BLAKE2B_256_HMAC     = 0x0000003bL;
+    public static final long  CKK_BLAKE2B_384_HMAC     = 0x0000003cL;
+    public static final long  CKK_BLAKE2B_512_HMAC     = 0x0000003dL;
+    public static final long  CKK_SALSA20              = 0x0000003eL;
+    public static final long  CKK_X2RATCHET            = 0x0000003fL;
+    public static final long  CKK_EC_EDWARDS           = 0x00000040L;
+    public static final long  CKK_EC_MONTGOMERY        = 0x00000041L;
+    public static final long  CKK_HKDF                 = 0x00000042L;
+
+    public static final long  CKK_SHA512_224_HMAC      = 0x00000043L;
+    public static final long  CKK_SHA512_256_HMAC      = 0x00000044L;
+    public static final long  CKK_SHA512_T_HMAC        = 0x00000045L;
+
     public static final long  CKK_VENDOR_DEFINED       = 0x80000000L;
 
     // pseudo key type ANY (for template manager)
@@ -271,9 +317,22 @@
     public static final long  PCKK_TLSRSAPREMASTER     = 0x7FFFFF26L;
     public static final long  PCKK_TLSMASTER           = 0x7FFFFF27L;
 
+    /* Uncomment when actually used
+    public static final long  CK_CERTIFICATE_CATEGORY_UNSPECIFIED   = 0L;
+    public static final long  CK_CERTIFICATE_CATEGORY_TOKEN_USER    = 1L;
+    public static final long  CK_CERTIFICATE_CATEGORY_AUTHORITY     = 2L;
+    public static final long  CK_CERTIFICATE_CATEGORY_OTHER_ENTITY  = 3L;
+
+    public static final long  CK_SECURITY_DOMAIN_UNSPECIFIED   = 0L;
+    public static final long  CK_SECURITY_DOMAIN_MANUFACTURER  = 1L;
+    public static final long  CK_SECURITY_DOMAIN_OPERATOR      = 2L;
+    public static final long  CK_SECURITY_DOMAIN_THIRD_PARTY   = 3L;
+    */
+
     /* The following certificate types are defined: */
     public static final long  CKC_X_509                = 0x00000000L;
     public static final long  CKC_X_509_ATTR_CERT      = 0x00000001L;
+    public static final long  CKC_WTLS                 = 0x00000002L;
     public static final long  CKC_VENDOR_DEFINED       = 0x80000000L;
 
     /* The CKF_ARRAY_ATTRIBUTE flag identifies an attribute which
@@ -281,11 +340,23 @@
      */
     public static final long  CKF_ARRAY_ATTRIBUTE      = 0x40000000L;
 
+    /* Uncomment when actually used
+    public static final long  CK_OTP_FORMAT_DECIMAL         = 0L;
+    public static final long  CK_OTP_FORMAT_HEXADECIMAL     = 1L;
+    public static final long  CK_OTP_FORMAT_ALPHANUMERIC    = 2L;
+    public static final long  CK_OTP_FORMAT_BINARY          = 3L;
+
+    public static final long  CK_OTP_PARAM_IGNORED          = 0L;
+    public static final long  CK_OTP_PARAM_OPTIONAL         = 1L;
+    public static final long  CK_OTP_PARAM_MANDATORY        = 2L;
+    */
+
     /* The following attribute types are defined: */
     public static final long  CKA_CLASS              = 0x00000000L;
     public static final long  CKA_TOKEN              = 0x00000001L;
     public static final long  CKA_PRIVATE            = 0x00000002L;
     public static final long  CKA_LABEL              = 0x00000003L;
+    public static final long  CKA_UNIQUE_ID          = 0x00000004L;
     public static final long  CKA_APPLICATION        = 0x00000010L;
     public static final long  CKA_VALUE              = 0x00000011L;
     public static final long  CKA_OBJECT_ID          = 0x00000012L;
@@ -343,12 +414,10 @@
 
     public static final long  CKA_VALUE_BITS         = 0x00000160L;
     public static final long  CKA_VALUE_LEN          = 0x00000161L;
-
     public static final long  CKA_EXTRACTABLE        = 0x00000162L;
     public static final long  CKA_LOCAL              = 0x00000163L;
     public static final long  CKA_NEVER_EXTRACTABLE  = 0x00000164L;
     public static final long  CKA_ALWAYS_SENSITIVE   = 0x00000165L;
-
     public static final long  CKA_KEY_GEN_MECHANISM  = 0x00000166L;
 
     public static final long  CKA_MODIFIABLE         = 0x00000170L;
@@ -406,6 +475,25 @@
     public static final long  CKA_SUPPORTED_CMS_ATTRIBUTES     = 0x00000503L;
     public static final long  CKA_ALLOWED_MECHANISMS = (CKF_ARRAY_ATTRIBUTE|0x00000600L);
 
+    public static final long  CKA_PROFILE_ID                   = 0x00000601L;
+    public static final long  CKA_X2RATCHET_BAG                = 0x00000602L;
+    public static final long  CKA_X2RATCHET_BAGSIZE            = 0x00000603L;
+    public static final long  CKA_X2RATCHET_BOBS1STMSG         = 0x00000604L;
+    public static final long  CKA_X2RATCHET_CKR                = 0x00000605L;
+    public static final long  CKA_X2RATCHET_CKS                = 0x00000606L;
+    public static final long  CKA_X2RATCHET_DHP                = 0x00000607L;
+    public static final long  CKA_X2RATCHET_DHR                = 0x00000608L;
+    public static final long  CKA_X2RATCHET_DHS                = 0x00000609L;
+    public static final long  CKA_X2RATCHET_HKR                = 0x0000060aL;
+    public static final long  CKA_X2RATCHET_HKS                = 0x0000060bL;
+    public static final long  CKA_X2RATCHET_ISALICE            = 0x0000060cL;
+    public static final long  CKA_X2RATCHET_NHKR               = 0x0000060dL;
+    public static final long  CKA_X2RATCHET_NHKS               = 0x0000060eL;
+    public static final long  CKA_X2RATCHET_NR                 = 0x0000060fL;
+    public static final long  CKA_X2RATCHET_NS                 = 0x00000610L;
+    public static final long  CKA_X2RATCHET_PNS                = 0x00000611L;
+    public static final long  CKA_X2RATCHET_RK                 = 0x00000612L;
+
     public static final long  CKA_VENDOR_DEFINED     = 0x80000000L;
 
     /* the following mechanism types are defined: */
@@ -435,6 +523,10 @@
     public static final long  CKM_DSA_SHA256                 = 0x00000014L;
     public static final long  CKM_DSA_SHA384                 = 0x00000015L;
     public static final long  CKM_DSA_SHA512                 = 0x00000016L;
+    public static final long  CKM_DSA_SHA3_224               = 0x00000018L;
+    public static final long  CKM_DSA_SHA3_256               = 0x00000019L;
+    public static final long  CKM_DSA_SHA3_384               = 0x0000001AL;
+    public static final long  CKM_DSA_SHA3_512               = 0x0000001BL;
 
     public static final long  CKM_DH_PKCS_KEY_PAIR_GEN       = 0x00000020L;
     public static final long  CKM_DH_PKCS_DERIVE             = 0x00000021L;
@@ -468,6 +560,15 @@
     public static final long  CKM_SHA512_T_HMAC_GENERAL      = 0x00000052L;
     public static final long  CKM_SHA512_T_KEY_DERIVATION    = 0x00000053L;
 
+    public static final long  CKM_SHA3_256_RSA_PKCS          = 0x00000060L;
+    public static final long  CKM_SHA3_384_RSA_PKCS          = 0x00000061L;
+    public static final long  CKM_SHA3_512_RSA_PKCS          = 0x00000062L;
+    public static final long  CKM_SHA3_256_RSA_PKCS_PSS      = 0x00000063L;
+    public static final long  CKM_SHA3_384_RSA_PKCS_PSS      = 0x00000064L;
+    public static final long  CKM_SHA3_512_RSA_PKCS_PSS      = 0x00000065L;
+    public static final long  CKM_SHA3_224_RSA_PKCS          = 0x00000066L;
+    public static final long  CKM_SHA3_224_RSA_PKCS_PSS      = 0x00000067L;
+
     public static final long  CKM_RC2_KEY_GEN                = 0x00000100L;
     public static final long  CKM_RC2_ECB                    = 0x00000101L;
     public static final long  CKM_RC2_CBC                    = 0x00000102L;
@@ -551,6 +652,23 @@
     public static final long  CKM_ACTI                       = 0x000002A0L;
     public static final long  CKM_ACTI_KEY_GEN               = 0x000002A1L;
 
+    public static final long  CKM_SHA3_256                   = 0x000002B0L;
+    public static final long  CKM_SHA3_256_HMAC              = 0x000002B1L;
+    public static final long  CKM_SHA3_256_HMAC_GENERAL      = 0x000002B2L;
+    public static final long  CKM_SHA3_256_KEY_GEN           = 0x000002B3L;
+    public static final long  CKM_SHA3_224                   = 0x000002B5L;
+    public static final long  CKM_SHA3_224_HMAC              = 0x000002B6L;
+    public static final long  CKM_SHA3_224_HMAC_GENERAL      = 0x000002B7L;
+    public static final long  CKM_SHA3_224_KEY_GEN           = 0x000002B8L;
+    public static final long  CKM_SHA3_384                   = 0x000002C0L;
+    public static final long  CKM_SHA3_384_HMAC              = 0x000002C1L;
+    public static final long  CKM_SHA3_384_HMAC_GENERAL      = 0x000002C2L;
+    public static final long  CKM_SHA3_384_KEY_GEN           = 0x000002C3L;
+    public static final long  CKM_SHA3_512                   = 0x000002D0L;
+    public static final long  CKM_SHA3_512_HMAC              = 0x000002D1L;
+    public static final long  CKM_SHA3_512_HMAC_GENERAL      = 0x000002D2L;
+    public static final long  CKM_SHA3_512_KEY_GEN           = 0x000002D3L;
+
     public static final long  CKM_CAST_KEY_GEN               = 0x00000300L;
     public static final long  CKM_CAST_ECB                   = 0x00000301L;
     public static final long  CKM_CAST_CBC                   = 0x00000302L;
@@ -611,19 +729,26 @@
     public static final long  CKM_MD5_KEY_DERIVATION         = 0x00000390L;
     public static final long  CKM_MD2_KEY_DERIVATION         = 0x00000391L;
     public static final long  CKM_SHA1_KEY_DERIVATION        = 0x00000392L;
-
     public static final long  CKM_SHA256_KEY_DERIVATION      = 0x00000393L;
     public static final long  CKM_SHA384_KEY_DERIVATION      = 0x00000394L;
     public static final long  CKM_SHA512_KEY_DERIVATION      = 0x00000395L;
     public static final long  CKM_SHA224_KEY_DERIVATION      = 0x00000396L;
+    public static final long  CKM_SHA3_256_KEY_DERIVATION    = 0x00000397L;
+    public static final long  CKM_SHA3_224_KEY_DERIVATION    = 0x00000398L;
+    public static final long  CKM_SHA3_384_KEY_DERIVATION    = 0x00000399L;
+    public static final long  CKM_SHA3_512_KEY_DERIVATION    = 0x0000039AL;
+    public static final long  CKM_SHAKE_128_KEY_DERIVATION   = 0x0000039BL;
+    public static final long  CKM_SHAKE_256_KEY_DERIVATION   = 0x0000039CL;
 
     public static final long  CKM_PBE_MD2_DES_CBC            = 0x000003A0L;
     public static final long  CKM_PBE_MD5_DES_CBC            = 0x000003A1L;
     public static final long  CKM_PBE_MD5_CAST_CBC           = 0x000003A2L;
     public static final long  CKM_PBE_MD5_CAST3_CBC          = 0x000003A3L;
-    public static final long  CKM_PBE_MD5_CAST5_CBC          = 0x000003A4L;
+    public static final long  CKM_PBE_MD5_CAST5_CBC /*deprecated*/
+                                                             = 0x000003A4L;
     public static final long  CKM_PBE_MD5_CAST128_CBC        = 0x000003A4L;
-    public static final long  CKM_PBE_SHA1_CAST5_CBC         = 0x000003A5L;
+    public static final long  CKM_PBE_SHA1_CAST5_CBC /*deprecated*/
+                                                             = 0x000003A5L;
     public static final long  CKM_PBE_SHA1_CAST128_CBC       = 0x000003A5L;
     public static final long  CKM_PBE_SHA1_RC4_128           = 0x000003A6L;
     public static final long  CKM_PBE_SHA1_RC4_40            = 0x000003A7L;
@@ -643,11 +768,12 @@
     public static final long  CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE  = 0x000003D4L;
     public static final long  CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE  = 0x000003D5L;
 
-    public static final long  CKM_TLS10_MAC_SERVER           = 0x000003D6L;
-    public static final long  CKM_TLS10_MAC_CLIENT           = 0x000003D7L;
+    public static final long  CKM_TLS10_MAC_SERVER /*removed in 3.00*/
+                                                             = 0x000003D6L;
+    public static final long  CKM_TLS10_MAC_CLIENT /*removed in 3.00*/
+                                                             = 0x000003D7L;
     public static final long  CKM_TLS12_MAC                  = 0x000003D8L;
     public static final long  CKM_TLS12_KDF                  = 0x000003D9L;
-
     public static final long  CKM_TLS12_MASTER_KEY_DERIVE    = 0x000003E0L;
     public static final long  CKM_TLS12_KEY_AND_MAC_DERIVE   = 0x000003E1L;
     public static final long  CKM_TLS12_MASTER_KEY_DERIVE_DH = 0x000003E2L;
@@ -717,6 +843,7 @@
     public static final long  CKM_ECDSA_KEY_PAIR_GEN /*deprecated*/
                                                              = 0x00001040L;
     public static final long  CKM_EC_KEY_PAIR_GEN            = 0x00001040L;
+    public static final long  CKM_EC_KEY_PAIR_GEN_W_EXTRA_BITS = 0x0000140BL;
 
     public static final long  CKM_ECDSA                      = 0x00001041L;
     public static final long  CKM_ECDSA_SHA1                 = 0x00001042L;
@@ -724,6 +851,10 @@
     public static final long  CKM_ECDSA_SHA256               = 0x00001044L;
     public static final long  CKM_ECDSA_SHA384               = 0x00001045L;
     public static final long  CKM_ECDSA_SHA512               = 0x00001046L;
+    public static final long  CKM_ECDSA_SHA3_224             = 0x00001047L;
+    public static final long  CKM_ECDSA_SHA3_256             = 0x00001048L;
+    public static final long  CKM_ECDSA_SHA3_384             = 0x00001049L;
+    public static final long  CKM_ECDSA_SHA3_512             = 0x0000104AL;
 
     public static final long  CKM_ECDH1_DERIVE               = 0x00001050L;
     public static final long  CKM_ECDH1_COFACTOR_DERIVE      = 0x00001051L;
@@ -732,6 +863,10 @@
     public static final long  CKM_ECDH_AES_KEY_WRAP          = 0x00001053L;
     public static final long  CKM_RSA_AES_KEY_WRAP           = 0x00001054L;
 
+    public static final long  CKM_EC_EDWARDS_KEY_PAIR_GEN    = 0x00001055L;
+    public static final long  CKM_EC_MONTGOMERY_KEY_PAIR_GEN = 0x00001056L;
+    public static final long  CKM_EDDSA                      = 0x00001057L;
+
     public static final long  CKM_JUNIPER_KEY_GEN            = 0x00001060L;
     public static final long  CKM_JUNIPER_ECB128             = 0x00001061L;
     public static final long  CKM_JUNIPER_CBC128             = 0x00001062L;
@@ -740,6 +875,8 @@
     public static final long  CKM_JUNIPER_WRAP               = 0x00001065L;
     public static final long  CKM_FASTHASH                   = 0x00001070L;
 
+    public static final long  CKM_AES_XTS                    = 0x00001071L;
+    public static final long  CKM_AES_XTS_KEY_GEN            = 0x00001072L;
     public static final long  CKM_AES_KEY_GEN                = 0x00001080L;
     public static final long  CKM_AES_ECB                    = 0x00001081L;
     public static final long  CKM_AES_CBC                    = 0x00001082L;
@@ -784,23 +921,80 @@
     public static final long  CKM_GOST28147_MAC              = 0x00001223L;
     public static final long  CKM_GOST28147_KEY_WRAP         = 0x00001224L;
 
+    public static final long  CKM_CHACHA20_KEY_GEN           = 0x00001225L;
+    public static final long  CKM_CHACHA20                   = 0x00001226L;
+    public static final long  CKM_POLY1305_KEY_GEN           = 0x00001227L;
+    public static final long  CKM_POLY1305                   = 0x00001228L;
+
     public static final long  CKM_DSA_PARAMETER_GEN          = 0x00002000L;
     public static final long  CKM_DH_PKCS_PARAMETER_GEN      = 0x00002001L;
     public static final long  CKM_X9_42_DH_PARAMETER_GEN     = 0x00002002L;
     public static final long  CKM_DSA_PROBABLISTIC_PARAMETER_GEN = 0x00002003L;
     public static final long  CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN = 0x00002004L;
+    public static final long  CKM_DSA_FIPS_G_GEN             = 0x00002005L;
 
     public static final long  CKM_AES_OFB                    = 0x00002104L;
     public static final long  CKM_AES_CFB64                  = 0x00002105L;
     public static final long  CKM_AES_CFB8                   = 0x00002106L;
     public static final long  CKM_AES_CFB128                 = 0x00002107L;
     public static final long  CKM_AES_CFB1                   = 0x00002108L;
-    public static final long  CKM_AES_KEY_WRAP               = 0x00002109L;
-    public static final long  CKM_AES_KEY_WRAP_PAD           = 0x0000210AL;
+    public static final long  CKM_AES_KEY_WRAP /* WAS: 0x00001090 */
+                                                             = 0x00002109L;
+    public static final long  CKM_AES_KEY_WRAP_PAD /* WAS: 0x00001091 */
+                                                             = 0x0000210AL;
+    public static final long  CKM_AES_KEY_WRAP_KWP           = 0x0000210BL;
 
     public static final long  CKM_RSA_PKCS_TPM_1_1           = 0x00004001L;
     public static final long  CKM_RSA_PKCS_OAEP_TPM_1_1      = 0x00004002L;
 
+    public static final long  CKM_SHA_1_KEY_GEN              = 0x00004003L;
+    public static final long  CKM_SHA224_KEY_GEN             = 0x00004004L;
+    public static final long  CKM_SHA256_KEY_GEN             = 0x00004005L;
+    public static final long  CKM_SHA384_KEY_GEN             = 0x00004006L;
+    public static final long  CKM_SHA512_KEY_GEN             = 0x00004007L;
+    public static final long  CKM_SHA512_224_KEY_GEN         = 0x00004008L;
+    public static final long  CKM_SHA512_256_KEY_GEN         = 0x00004009L;
+    public static final long  CKM_SHA512_T_KEY_GEN           = 0x0000400aL;
+    public static final long  CKM_NULL                       = 0x0000400bL;
+    public static final long  CKM_BLAKE2B_160                = 0x0000400cL;
+    public static final long  CKM_BLAKE2B_160_HMAC           = 0x0000400dL;
+    public static final long  CKM_BLAKE2B_160_HMAC_GENERAL   = 0x0000400eL;
+    public static final long  CKM_BLAKE2B_160_KEY_DERIVE     = 0x0000400fL;
+    public static final long  CKM_BLAKE2B_160_KEY_GEN        = 0x00004010L;
+    public static final long  CKM_BLAKE2B_256                = 0x00004011L;
+    public static final long  CKM_BLAKE2B_256_HMAC           = 0x00004012L;
+    public static final long  CKM_BLAKE2B_256_HMAC_GENERAL   = 0x00004013L;
+    public static final long  CKM_BLAKE2B_256_KEY_DERIVE     = 0x00004014L;
+    public static final long  CKM_BLAKE2B_256_KEY_GEN        = 0x00004015L;
+    public static final long  CKM_BLAKE2B_384                = 0x00004016L;
+    public static final long  CKM_BLAKE2B_384_HMAC           = 0x00004017L;
+    public static final long  CKM_BLAKE2B_384_HMAC_GENERAL   = 0x00004018L;
+    public static final long  CKM_BLAKE2B_384_KEY_DERIVE     = 0x00004019L;
+    public static final long  CKM_BLAKE2B_384_KEY_GEN        = 0x0000401aL;
+    public static final long  CKM_BLAKE2B_512                = 0x0000401bL;
+    public static final long  CKM_BLAKE2B_512_HMAC           = 0x0000401cL;
+    public static final long  CKM_BLAKE2B_512_HMAC_GENERAL   = 0x0000401dL;
+    public static final long  CKM_BLAKE2B_512_KEY_DERIVE     = 0x0000401eL;
+    public static final long  CKM_BLAKE2B_512_KEY_GEN        = 0x0000401fL;
+    public static final long  CKM_SALSA20                    = 0x00004020L;
+    public static final long  CKM_CHACHA20_POLY1305          = 0x00004021L;
+    public static final long  CKM_SALSA20_POLY1305           = 0x00004022L;
+    public static final long  CKM_X3DH_INITIALIZE            = 0x00004023L;
+    public static final long  CKM_X3DH_RESPOND               = 0x00004024L;
+    public static final long  CKM_X2RATCHET_INITIALIZE       = 0x00004025L;
+    public static final long  CKM_X2RATCHET_RESPOND          = 0x00004026L;
+    public static final long  CKM_X2RATCHET_ENCRYPT          = 0x00004027L;
+    public static final long  CKM_X2RATCHET_DECRYPT          = 0x00004028L;
+    public static final long  CKM_XEDDSA                     = 0x00004029L;
+    public static final long  CKM_HKDF_DERIVE                = 0x0000402aL;
+    public static final long  CKM_HKDF_DATA                  = 0x0000402bL;
+    public static final long  CKM_HKDF_KEY_GEN               = 0x0000402cL;
+    public static final long  CKM_SALSA20_KEY_GEN            = 0x0000402dL;
+
+    public static final long  CKM_SP800_108_COUNTER_KDF      = 0x000003acL;
+    public static final long  CKM_SP800_108_FEEDBACK_KDF     = 0x000003adL;
+    public static final long  CKM_SP800_108_DOUBLE_PIPELINE_KDF = 0x000003aeL;
+
     public static final long  CKM_VENDOR_DEFINED             = 0x80000000L;
 
     // NSS private
@@ -813,6 +1007,13 @@
     /* The flags specify whether or not a mechanism can be used for a
      * particular task */
     public static final long  CKF_HW                 = 0x00000001L;
+    public static final long  CKF_MESSAGE_ENCRYPT    = 0x00000002L;
+    public static final long  CKF_MESSAGE_DECRYPT    = 0x00000004L;
+    public static final long  CKF_MESSAGE_SIGN       = 0x00000008L;
+    public static final long  CKF_MESSAGE_VERIFY     = 0x00000010L;
+    public static final long  CKF_MULTI_MESSAGE      = 0x00000020L;
+    public static final long  CKF_FIND_OBJECTS       = 0x00000040L;
+
     public static final long  CKF_ENCRYPT            = 0x00000100L;
     public static final long  CKF_DECRYPT            = 0x00000200L;
     public static final long  CKF_DIGEST             = 0x00000400L;
@@ -832,13 +1033,15 @@
     public static final long  CKF_EC_F_P             = 0x00100000L;
     public static final long  CKF_EC_F_2M            = 0x00200000L;
     public static final long  CKF_EC_ECPARAMETERS    = 0x00400000L;
-    public static final long  CKF_EC_NAMEDCURVE      = 0x00800000L;
+    public static final long  CKF_EC_OID             = 0x00400000L;
+    public static final long  CKF_EC_NAMEDCURVE /*deprecated since 3.00*/
+                                                     = CKF_EC_OID;
     public static final long  CKF_EC_UNCOMPRESS      = 0x01000000L;
     public static final long  CKF_EC_COMPRESS        = 0x02000000L;
+    public static final long  CKF_EC_CURVENAME       = 0x04000000L;
 
     public static final long  CKF_EXTENSION          = 0x80000000L;
 
-
     /* Identifies the return value of a Cryptoki function */
     public static final long  CKR_OK                 = 0x00000000L;
     public static final long  CKR_CANCEL             = 0x00000001L;
@@ -867,6 +1070,7 @@
     public static final long  CKR_DEVICE_REMOVED            = 0x00000032L;
     public static final long  CKR_ENCRYPTED_DATA_INVALID    = 0x00000040L;
     public static final long  CKR_ENCRYPTED_DATA_LEN_RANGE  = 0x00000041L;
+    public static final long  CKR_AEAD_DECRYPT_FAILED       = 0x00000042L;
     public static final long  CKR_FUNCTION_CANCELED         = 0x00000050L;
     public static final long  CKR_FUNCTION_NOT_PARALLEL     = 0x00000051L;
 
@@ -959,9 +1163,15 @@
     public static final long  CKR_PIN_TOO_WEAK                   = 0x000001B8L;
     public static final long  CKR_PUBLIC_KEY_INVALID             = 0x000001B9L;
     public static final long  CKR_FUNCTION_REJECTED              = 0x00000200L;
+    public static final long  CKR_TOKEN_RESOURCE_EXCEEDED        = 0x00000201L;
+    public static final long  CKR_OPERATION_CANCEL_FAILED        = 0x00000202L;
 
     public static final long  CKR_VENDOR_DEFINED                 = 0x80000000L;
 
+    /* Uncomment when actually used
+    public static final long  CKF_END_OF_MESSAGE      = 0x00000001L;
+    public static final long  CKF_INTERFACE_FORK_SAFE = 0x00000001L;
+    */
 
     /* flags: bit flags that provide capabilities of the slot
      *        Bit Flag = Mask
@@ -969,7 +1179,6 @@
     public static final long  CKF_LIBRARY_CANT_CREATE_OS_THREADS = 0x00000001L;
     public static final long  CKF_OS_LOCKING_OK                  = 0x00000002L;
 
-
     /* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
     public static final long  CKF_DONT_BLOCK =    1L;
 
@@ -979,16 +1188,20 @@
     public static final long  CKG_MGF1_SHA384     = 0x00000003L;
     public static final long  CKG_MGF1_SHA512     = 0x00000004L;
     public static final long  CKG_MGF1_SHA224     = 0x00000005L;
+    public static final long  CKG_MGF1_SHA3_224   = 0x00000006L;
+    public static final long  CKG_MGF1_SHA3_256   = 0x00000007L;
+    public static final long  CKG_MGF1_SHA3_384   = 0x00000008L;
+    public static final long  CKG_MGF1_SHA3_512   = 0x00000009L;
 
     /* The following encoding parameter sources are defined */
     public static final long  CKZ_DATA_SPECIFIED   = 0x00000001L;
 
-
-    /* the following EC Key Derivation Functions are defined */
+    // the following EC Key Derivation Functions are defined
     public static final long  CKD_NULL                 = 0x00000001L;
     public static final long  CKD_SHA1_KDF             = 0x00000002L;
 
-    /* the following X9.42 Diffie-Hellman Key Derivation Functions are defined */
+    /* Uncomment when actually used
+    // the following X9.42 Diffie-Hellman Key Derivation Functions are defined
     public static final long  CKD_SHA1_KDF_ASN1        = 0x00000003L;
     public static final long  CKD_SHA1_KDF_CONCATENATE = 0x00000004L;
     public static final long  CKD_SHA224_KDF           = 0x00000005L;
@@ -996,6 +1209,23 @@
     public static final long  CKD_SHA384_KDF           = 0x00000007L;
     public static final long  CKD_SHA512_KDF           = 0x00000008L;
     public static final long  CKD_CPDIVERSIFY_KDF      = 0x00000009L;
+    public static final long  CKD_SHA3_224_KDF         = 0x0000000AL;
+    public static final long  CKD_SHA3_256_KDF         = 0x0000000BL;
+    public static final long  CKD_SHA3_384_KDF         = 0x0000000CL;
+    public static final long  CKD_SHA3_512_KDF         = 0x0000000DL;
+    public static final long  CKD_SHA1_KDF_SP800       = 0x0000000EL;
+    public static final long  CKD_SHA224_KDF_SP800     = 0x0000000FL;
+    public static final long  CKD_SHA256_KDF_SP800     = 0x00000010L;
+    public static final long  CKD_SHA384_KDF_SP800     = 0x00000011L;
+    public static final long  CKD_SHA512_KDF_SP800     = 0x00000012L;
+    public static final long  CKD_SHA3_224_KDF_SP800   = 0x00000013L;
+    public static final long  CKD_SHA3_256_KDF_SP800   = 0x00000014L;
+    public static final long  CKD_SHA3_384_KDF_SP800   = 0x00000015L;
+    public static final long  CKD_SHA3_512_KDF_SP800   = 0x00000016L;
+    public static final long  CKD_BLAKE2B_160_KDF      = 0x00000017L;
+    public static final long  CKD_BLAKE2B_256_KDF      = 0x00000018L;
+    public static final long  CKD_BLAKE2B_384_KDF      = 0x00000019L;
+    public static final long  CKD_BLAKE2B_512_KDF      = 0x0000001aL;
 
     public static final long  CKP_PKCS5_PBKD2_HMAC_SHA1        = 0x00000001L;
     public static final long  CKP_PKCS5_PBKD2_HMAC_GOSTR3411   = 0x00000002L;
@@ -1024,33 +1254,53 @@
     public static final long  CKF_EXCLUDE_PIN         = 0x00000010L;
     public static final long  CKF_USER_FRIENDLY_OTP   = 0x00000020L;
 
+    public static final long  CKG_NO_GENERATE      = 0x00000000L;
+    public static final long  CKG_GENERATE         = 0x00000001L;
+    public static final long  CKG_GENERATE_COUNTER = 0x00000002L;
+    public static final long  CKG_GENERATE_RANDOM  = 0x00000003L;
+
+    public static final long  CK_SP800_108_ITERATION_VARIABLE = 0x00000001L;
+    public static final long  CK_SP800_108_OPTIONAL_COUNTER   = 0x00000002L;
+    public static final long  CK_SP800_108_DKM_LENGTH         = 0x00000003L;
+    public static final long  CK_SP800_108_BYTE_ARRAY         = 0x00000004L;
+    public static final long  CK_SP800_108_DKM_LENGTH_SUM_OF_KEYS
+                                                              = 0x00000001L;
+    public static final long  CK_SP800_108_DKM_LENGTH_SUM_OF_SEGMENTS
+                                                              = 0x00000002L;
+
+    public static final long  CKF_HKDF_SALT_NULL   = 0x00000001L;
+    public static final long  CKF_HKDF_SALT_DATA   = 0x00000002L;
+    public static final long  CKF_HKDF_SALT_KEY    = 0x00000004L;
+    */
+
     // private NSS attribute (for DSA and DH private keys)
     public static final long  CKA_NETSCAPE_DB         = 0xD5A0DB00L;
 
     // base number of NSS private attributes
-    public static final long  CKA_NETSCAPE_BASE       = 0x80000000L + 0x4E534350L;
+    public static final long  CKA_NETSCAPE_BASE /*0x80000000L + 0x4E534350L*/
+                                                      = 0xCE534350L;
 
     // object type for NSS trust
-    public static final long  CKO_NETSCAPE_TRUST      = CKA_NETSCAPE_BASE + 3;
+    public static final long  CKO_NETSCAPE_TRUST      = 0xCE534353L;
 
     // base number for NSS trust attributes
-    public static final long  CKA_NETSCAPE_TRUST_BASE = CKA_NETSCAPE_BASE + 0x2000;
+    public static final long  CKA_NETSCAPE_TRUST_BASE = 0xCE536350L;
 
     // attributes for NSS trust
-    public static final long  CKA_NETSCAPE_TRUST_SERVER_AUTH      = CKA_NETSCAPE_TRUST_BASE +   8;
-    public static final long  CKA_NETSCAPE_TRUST_CLIENT_AUTH      = CKA_NETSCAPE_TRUST_BASE +   9;
-    public static final long  CKA_NETSCAPE_TRUST_CODE_SIGNING     = CKA_NETSCAPE_TRUST_BASE +  10;
-    public static final long  CKA_NETSCAPE_TRUST_EMAIL_PROTECTION = CKA_NETSCAPE_TRUST_BASE +  11;
-    public static final long  CKA_NETSCAPE_CERT_SHA1_HASH         = CKA_NETSCAPE_TRUST_BASE + 100;
-    public static final long  CKA_NETSCAPE_CERT_MD5_HASH          = CKA_NETSCAPE_TRUST_BASE + 101;
+    public static final long  CKA_NETSCAPE_TRUST_SERVER_AUTH      = 0xCE536358L;
+    public static final long  CKA_NETSCAPE_TRUST_CLIENT_AUTH      = 0xCE536359L;
+    public static final long  CKA_NETSCAPE_TRUST_CODE_SIGNING     = 0xCE53635AL;
+    public static final long  CKA_NETSCAPE_TRUST_EMAIL_PROTECTION = 0xCE53635BL;
+    public static final long  CKA_NETSCAPE_CERT_SHA1_HASH         = 0xCE5363B4L;
+    public static final long  CKA_NETSCAPE_CERT_MD5_HASH          = 0xCE5363B5L;
 
     // trust values for each of the NSS trust attributes
-    public static final long  CKT_NETSCAPE_TRUSTED           = CKA_NETSCAPE_BASE + 1;
-    public static final long  CKT_NETSCAPE_TRUSTED_DELEGATOR = CKA_NETSCAPE_BASE + 2;
-    public static final long  CKT_NETSCAPE_UNTRUSTED         = CKA_NETSCAPE_BASE + 3;
-    public static final long  CKT_NETSCAPE_MUST_VERIFY       = CKA_NETSCAPE_BASE + 4;
-    public static final long  CKT_NETSCAPE_TRUST_UNKNOWN     = CKA_NETSCAPE_BASE + 5; /* default */
-    public static final long  CKT_NETSCAPE_VALID             = CKA_NETSCAPE_BASE + 10;
-    public static final long  CKT_NETSCAPE_VALID_DELEGATOR   = CKA_NETSCAPE_BASE + 11;
-
+    public static final long  CKT_NETSCAPE_TRUSTED           = 0xCE534351L;
+    public static final long  CKT_NETSCAPE_TRUSTED_DELEGATOR = 0xCE534352L;
+    public static final long  CKT_NETSCAPE_UNTRUSTED         = 0xCE534353L;
+    public static final long  CKT_NETSCAPE_MUST_VERIFY       = 0xCE534354L;
+    public static final long  CKT_NETSCAPE_TRUST_UNKNOWN /* default */
+                                                             = 0xCE534355L;
+    public static final long  CKT_NETSCAPE_VALID             = 0xCE53435AL;
+    public static final long  CKT_NETSCAPE_VALID_DELEGATOR   = 0xCE53435BL;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -48,7 +48,7 @@
 package sun.security.pkcs11.wrapper;
 
 import java.util.*;
-
+import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
 
 /**
  * This is the superclass of all checked exceptions used by this package. An
@@ -73,101 +73,105 @@
     private static final Map<Long,String> errorMap;
 
     static {
-        int[] errorCodes = new int[] {
-            0x00000000,
-            0x00000001,
-            0x00000002,
-            0x00000003,
-            0x00000005,
-            0x00000006,
-            0x00000007,
-            0x00000008,
-            0x00000009,
-            0x0000000A,
-            0x00000010,
-            0x00000011,
-            0x00000012,
-            0x00000013,
-            0x0000001B,
-            0x00000020,
-            0x00000021,
-            0x00000030,
-            0x00000031,
-            0x00000032,
-            0x00000040,
-            0x00000041,
-            0x00000050,
-            0x00000051,
-            0x00000054,
-            0x00000060,
-            0x00000062,
-            0x00000063,
-            0x00000064,
-            0x00000065,
-            0x00000066,
-            0x00000067,
-            0x00000068,
-            0x00000069,
-            0x0000006A,
-            0x00000070,
-            0x00000071,
-            0x00000082,
-            0x00000090,
-            0x00000091,
-            0x000000A0,
-            0x000000A1,
-            0x000000A2,
-            0x000000A3,
-            0x000000A4,
-            0x000000B0,
-            0x000000B1,
-            0x000000B3,
-            0x000000B4,
-            0x000000B5,
-            0x000000B6,
-            0x000000B7,
-            0x000000B8,
-            0x000000C0,
-            0x000000C1,
-            0x000000D0,
-            0x000000D1,
-            0x000000E0,
-            0x000000E1,
-            0x000000E2,
-            0x000000F0,
-            0x000000F1,
-            0x000000F2,
-            0x00000100,
-            0x00000101,
-            0x00000102,
-            0x00000103,
-            0x00000104,
-            0x00000105,
-            0x00000110,
-            0x00000112,
-            0x00000113,
-            0x00000114,
-            0x00000115,
-            0x00000120,
-            0x00000121,
-            0x00000130,
-            0x00000150,
-            0x00000160,
-            0x00000170,
-            0x00000180,
-            0x00000190,
-            0x00000191,
-            0x000001A0,
-            0x000001A1,
-            0x000001B0,
-            0x000001B1,
-            0x000001B5,
-            0x000001B6,
-            0x000001B7,
-            0x000001B8,
-            0x000001B9,
-            0x00000200,
-            0x80000000,
+        long[] errorCodes = new long[] {
+            CKR_OK,
+            CKR_CANCEL,
+            CKR_HOST_MEMORY,
+            CKR_SLOT_ID_INVALID,
+            CKR_GENERAL_ERROR,
+            CKR_FUNCTION_FAILED,
+            CKR_ARGUMENTS_BAD,
+            CKR_NO_EVENT,
+            CKR_NEED_TO_CREATE_THREADS,
+            CKR_CANT_LOCK,
+            CKR_ATTRIBUTE_READ_ONLY,
+            CKR_ATTRIBUTE_SENSITIVE,
+            CKR_ATTRIBUTE_TYPE_INVALID,
+            CKR_ATTRIBUTE_VALUE_INVALID,
+            CKR_ACTION_PROHIBITED,
+            CKR_DATA_INVALID,
+            CKR_DATA_LEN_RANGE,
+            CKR_DEVICE_ERROR,
+            CKR_DEVICE_MEMORY,
+            CKR_DEVICE_REMOVED,
+            CKR_ENCRYPTED_DATA_INVALID,
+            CKR_ENCRYPTED_DATA_LEN_RANGE,
+            CKR_AEAD_DECRYPT_FAILED,
+            CKR_FUNCTION_CANCELED,
+            CKR_FUNCTION_NOT_PARALLEL,
+            CKR_FUNCTION_NOT_SUPPORTED,
+            CKR_KEY_HANDLE_INVALID,
+            CKR_KEY_SIZE_RANGE,
+            CKR_KEY_TYPE_INCONSISTENT,
+            CKR_KEY_NOT_NEEDED,
+            CKR_KEY_CHANGED,
+            CKR_KEY_NEEDED,
+            CKR_KEY_INDIGESTIBLE,
+            CKR_KEY_FUNCTION_NOT_PERMITTED,
+            CKR_KEY_NOT_WRAPPABLE,
+            CKR_KEY_UNEXTRACTABLE,
+            CKR_MECHANISM_INVALID,
+            CKR_MECHANISM_PARAM_INVALID,
+            CKR_OBJECT_HANDLE_INVALID,
+            CKR_OPERATION_ACTIVE,
+            CKR_OPERATION_NOT_INITIALIZED,
+            CKR_PIN_INCORRECT,
+            CKR_PIN_INVALID,
+            CKR_PIN_LEN_RANGE,
+            CKR_PIN_EXPIRED,
+            CKR_PIN_LOCKED,
+            CKR_SESSION_CLOSED,
+            CKR_SESSION_COUNT,
+            CKR_SESSION_HANDLE_INVALID,
+            CKR_SESSION_PARALLEL_NOT_SUPPORTED,
+            CKR_SESSION_READ_ONLY,
+            CKR_SESSION_EXISTS,
+            CKR_SESSION_READ_ONLY_EXISTS,
+            CKR_SESSION_READ_WRITE_SO_EXISTS,
+            CKR_SIGNATURE_INVALID,
+            CKR_SIGNATURE_LEN_RANGE,
+            CKR_TEMPLATE_INCOMPLETE,
+            CKR_TEMPLATE_INCONSISTENT,
+            CKR_TOKEN_NOT_PRESENT,
+            CKR_TOKEN_NOT_RECOGNIZED,
+            CKR_TOKEN_WRITE_PROTECTED,
+            CKR_UNWRAPPING_KEY_HANDLE_INVALID,
+            CKR_UNWRAPPING_KEY_SIZE_RANGE,
+            CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT,
+            CKR_USER_ALREADY_LOGGED_IN,
+            CKR_USER_NOT_LOGGED_IN,
+            CKR_USER_PIN_NOT_INITIALIZED,
+            CKR_USER_TYPE_INVALID,
+            CKR_USER_ANOTHER_ALREADY_LOGGED_IN,
+            CKR_USER_TOO_MANY_TYPES,
+            CKR_WRAPPED_KEY_INVALID,
+            CKR_WRAPPED_KEY_LEN_RANGE,
+            CKR_WRAPPING_KEY_HANDLE_INVALID,
+            CKR_WRAPPING_KEY_SIZE_RANGE,
+            CKR_WRAPPING_KEY_TYPE_INCONSISTENT,
+            CKR_RANDOM_SEED_NOT_SUPPORTED,
+            CKR_RANDOM_NO_RNG,
+            CKR_DOMAIN_PARAMS_INVALID,
+            CKR_CURVE_NOT_SUPPORTED,
+            CKR_BUFFER_TOO_SMALL,
+            CKR_SAVED_STATE_INVALID,
+            CKR_INFORMATION_SENSITIVE,
+            CKR_STATE_UNSAVEABLE,
+            CKR_CRYPTOKI_NOT_INITIALIZED,
+            CKR_CRYPTOKI_ALREADY_INITIALIZED,
+            CKR_MUTEX_BAD,
+            CKR_MUTEX_NOT_LOCKED,
+            CKR_NEW_PIN_MODE,
+            CKR_NEXT_OTP,
+            CKR_EXCEEDED_MAX_ITERATIONS,
+            CKR_FIPS_SELF_TEST_FAILED,
+            CKR_LIBRARY_LOAD_FAILED,
+            CKR_PIN_TOO_WEAK,
+            CKR_PUBLIC_KEY_INVALID,
+            CKR_FUNCTION_REJECTED,
+            CKR_TOKEN_RESOURCE_EXCEEDED,
+            CKR_OPERATION_CANCEL_FAILED,
+            CKR_VENDOR_DEFINED,
         };
         String[] errorMessages = new String[] {
             "CKR_OK",
@@ -192,6 +196,7 @@
             "CKR_DEVICE_REMOVED",
             "CKR_ENCRYPTED_DATA_INVALID",
             "CKR_ENCRYPTED_DATA_LEN_RANGE",
+            "CKR_AEAD_DECRYPT_FAILED",
             "CKR_FUNCTION_CANCELED",
             "CKR_FUNCTION_NOT_PARALLEL",
             "CKR_FUNCTION_NOT_SUPPORTED",
@@ -247,6 +252,7 @@
             "CKR_RANDOM_SEED_NOT_SUPPORTED",
             "CKR_RANDOM_NO_RNG",
             "CKR_DOMAIN_PARAMS_INVALID",
+            "CKR_CURVE_NOT_SUPPORTED",
             "CKR_BUFFER_TOO_SMALL",
             "CKR_SAVED_STATE_INVALID",
             "CKR_INFORMATION_SENSITIVE",
@@ -263,6 +269,8 @@
             "CKR_PIN_TOO_WEAK",
             "CKR_PUBLIC_KEY_INVALID",
             "CKR_FUNCTION_REJECTED",
+            "CKR_TOKEN_RESOURCE_EXCEEDED",
+            "CKR_OPERATION_CANCEL_FAILED",
             "CKR_VENDOR_DEFINED",
         };
         errorMap = new HashMap<Long,String>();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	2021-09-01 14:33:15.000000000 +0000
@@ -272,6 +272,31 @@
     }
 
     /**
+     * Retries an action with password "\0" if "" fails.
+     * @param <T> the return type
+     */
+    @FunctionalInterface
+    private interface RetryWithZero<T> {
+
+        T tryOnce(char[] password) throws Exception;
+
+        static <S> S run(RetryWithZero<S> f, char[] password) throws Exception {
+            try {
+                return f.tryOnce(password);
+            } catch (Exception e) {
+                if (password.length == 0) {
+                    // Retry using an empty password with a NUL terminator.
+                    if (debug != null) {
+                        debug.println("Retry with a NUL password");
+                    }
+                    return f.tryOnce(new char[1]);
+                }
+                throw e;
+            }
+        }
+    }
+
+    /**
      * Private keys and certificates are stored in a map.
      * Map entries are keyed by alias names.
      */
@@ -344,7 +369,7 @@
 
        try {
             PBEParameterSpec pbeSpec;
-            int ic = 0;
+            int ic;
 
             if (algParams != null) {
                 try {
@@ -358,80 +383,72 @@
                 if (ic > MAX_ITERATION_COUNT) {
                     throw new IOException("PBE iteration count too large");
                 }
+            } else {
+                ic = 0;
             }
 
-            byte[] keyInfo;
-            while (true) {
-                try {
-                    // Use JCE
-                    SecretKey skey = getPBEKey(password);
-                    Cipher cipher = Cipher.getInstance(
+            key = RetryWithZero.run(pass -> {
+                // Use JCE
+                SecretKey skey = getPBEKey(pass);
+                Cipher cipher = Cipher.getInstance(
                         mapPBEParamsToAlgorithm(algOid, algParams));
-                    cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
-                    keyInfo = cipher.doFinal(encryptedKey);
-                    break;
-                } catch (Exception e) {
-                    if (password.length == 0) {
-                        // Retry using an empty password
-                        // without a NULL terminator.
-                        password = new char[1];
-                        continue;
-                    }
-                    throw e;
-                }
-            }
+                cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
+                byte[] keyInfo = cipher.doFinal(encryptedKey);
+                /*
+                 * Parse the key algorithm and then use a JCA key factory
+                 * to re-create the key.
+                 */
+                DerValue val = new DerValue(keyInfo);
+                DerInputStream in = val.toDerInputStream();
+                int i = in.getInteger();
+                DerValue[] value = in.getSequence(2);
+                if (value.length < 1 || value.length > 2) {
+                    throw new IOException("Invalid length for AlgorithmIdentifier");
+                }
+                AlgorithmId algId = new AlgorithmId(value[0].getOID());
+                String keyAlgo = algId.getName();
+
+                // decode private key
+                if (entry instanceof PrivateKeyEntry) {
+                    KeyFactory kfac = KeyFactory.getInstance(keyAlgo);
+                    PKCS8EncodedKeySpec kspec = new PKCS8EncodedKeySpec(keyInfo);
+                    Key tmp = kfac.generatePrivate(kspec);
 
-            /*
-             * Parse the key algorithm and then use a JCA key factory
-             * to re-create the key.
-             */
-            DerValue val = new DerValue(keyInfo);
-            DerInputStream in = val.toDerInputStream();
-            int i = in.getInteger();
-            DerValue[] value = in.getSequence(2);
-            if (value.length < 1 || value.length > 2) {
-                throw new IOException("Invalid length for AlgorithmIdentifier");
-            }
-            AlgorithmId algId = new AlgorithmId(value[0].getOID());
-            String keyAlgo = algId.getName();
-
-            // decode private key
-            if (entry instanceof PrivateKeyEntry) {
-                KeyFactory kfac = KeyFactory.getInstance(keyAlgo);
-                PKCS8EncodedKeySpec kspec = new PKCS8EncodedKeySpec(keyInfo);
-                key = kfac.generatePrivate(kspec);
-
-                if (debug != null) {
-                    debug.println("Retrieved a protected private key at alias" +
-                        " '" + alias + "' (" +
-                        new AlgorithmId(algOid).getName() +
-                        " iterations: " + ic + ")");
-                }
-
-            // decode secret key
-            } else {
-                byte[] keyBytes = in.getOctetString();
-                SecretKeySpec secretKeySpec =
-                    new SecretKeySpec(keyBytes, keyAlgo);
-
-                // Special handling required for PBE: needs a PBEKeySpec
-                if (keyAlgo.startsWith("PBE")) {
-                    SecretKeyFactory sKeyFactory =
-                        SecretKeyFactory.getInstance(keyAlgo);
-                    KeySpec pbeKeySpec =
-                        sKeyFactory.getKeySpec(secretKeySpec, PBEKeySpec.class);
-                    key = sKeyFactory.generateSecret(pbeKeySpec);
+                    if (debug != null) {
+                        debug.println("Retrieved a protected private key at alias" +
+                                " '" + alias + "' (" +
+                                new AlgorithmId(algOid).getName() +
+                                " iterations: " + ic + ")");
+                    }
+                    return tmp;
+                    // decode secret key
                 } else {
-                    key = secretKeySpec;
-                }
+                    byte[] keyBytes = in.getOctetString();
+                    SecretKeySpec secretKeySpec =
+                            new SecretKeySpec(keyBytes, keyAlgo);
+
+                    // Special handling required for PBE: needs a PBEKeySpec
+                    Key tmp;
+                    if (keyAlgo.startsWith("PBE")) {
+                        SecretKeyFactory sKeyFactory =
+                                SecretKeyFactory.getInstance(keyAlgo);
+                        KeySpec pbeKeySpec =
+                                sKeyFactory.getKeySpec(secretKeySpec, PBEKeySpec.class);
+                        tmp = sKeyFactory.generateSecret(pbeKeySpec);
+                    } else {
+                        tmp = secretKeySpec;
+                    }
 
-                if (debug != null) {
-                    debug.println("Retrieved a protected secret key at alias " +
-                        "'" + alias + "' (" +
-                        new AlgorithmId(algOid).getName() +
-                        " iterations: " + ic + ")");
+                    if (debug != null) {
+                        debug.println("Retrieved a protected secret key at alias " +
+                                "'" + alias + "' (" +
+                                new AlgorithmId(algOid).getName() +
+                                " iterations: " + ic + ")");
+                    }
+                    return tmp;
                 }
-            }
+            }, password);
+
         } catch (Exception e) {
             UnrecoverableKeyException uke =
                 new UnrecoverableKeyException("Get Key failed: " +
@@ -1974,7 +1991,6 @@
          * Spin over the ContentInfos.
          */
         for (int i = 0; i < count; i++) {
-            byte[] safeContentsData;
             ContentInfo safeContents;
             DerInputStream sci;
             byte[] eAlgId = null;
@@ -1982,14 +1998,13 @@
             sci = new DerInputStream(safeContentsArray[i].toByteArray());
             safeContents = new ContentInfo(sci);
             contentType = safeContents.getContentType();
-            safeContentsData = null;
             if (contentType.equals((Object)ContentInfo.DATA_OID)) {
 
                 if (debug != null) {
                     debug.println("Loading PKCS#7 data");
                 }
 
-                safeContentsData = safeContents.getData();
+                loadSafeContents(new DerInputStream(safeContents.getData()));
             } else if (contentType.equals((Object)ContentInfo.ENCRYPTED_DATA_OID)) {
                 if (password == null) {
 
@@ -2019,7 +2034,7 @@
                 if (seq[2].isConstructed())
                    newTag |= 0x20;
                 seq[2].resetTag(newTag);
-                safeContentsData = seq[2].getOctetString();
+                byte[] rawData = seq[2].getOctetString();
 
                 // parse Algorithm parameters
                 DerInputStream in = seq[1].toDerInputStream();
@@ -2050,32 +2065,25 @@
                         " iterations: " + ic + ")");
                 }
 
-                while (true) {
-                    try {
+                try {
+                    RetryWithZero.run(pass -> {
                         // Use JCE
-                        SecretKey skey = getPBEKey(password);
-                        Cipher cipher = Cipher.getInstance(algOid.toString());
+                        SecretKey skey = getPBEKey(pass);
+                        Cipher cipher = Cipher.getInstance(
+                                mapPBEParamsToAlgorithm(algOid, algParams));
                         cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
-                        safeContentsData = cipher.doFinal(safeContentsData);
-                        break;
-                    } catch (Exception e) {
-                        if (password.length == 0) {
-                            // Retry using an empty password
-                            // without a NULL terminator.
-                            password = new char[1];
-                            continue;
-                        }
-                        throw new IOException("keystore password was incorrect",
+                        loadSafeContents(new DerInputStream(cipher.doFinal(rawData)));
+                        return null;
+                    }, password);
+                } catch (Exception e) {
+                    throw new IOException("keystore password was incorrect",
                             new UnrecoverableKeyException(
-                                "failed to decrypt safe contents entry: " + e));
-                    }
+                                    "failed to decrypt safe contents entry: " + e));
                 }
             } else {
                 throw new IOException("public key protected PKCS12" +
                                         " not supported");
             }
-            DerInputStream sc = new DerInputStream(safeContentsData);
-            loadSafeContents(sc, password);
         }
 
         // The MacData is optional.
@@ -2099,20 +2107,24 @@
                 Mac m = Mac.getInstance("HmacPBE" + algName);
                 PBEParameterSpec params =
                         new PBEParameterSpec(macData.getSalt(), ic);
-                SecretKey key = getPBEKey(password);
-                m.init(key, params);
-                m.update(authSafeData);
-                byte[] macResult = m.doFinal();
 
-                if (debug != null) {
-                    debug.println("Checking keystore integrity " +
-                        "(" + m.getAlgorithm() + " iterations: " + ic + ")");
-                }
+                RetryWithZero.run(pass -> {
+                    SecretKey key = getPBEKey(pass);
+                    m.init(key, params);
+                    m.update(authSafeData);
+                    byte[] macResult = m.doFinal();
 
-                if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
-                   throw new UnrecoverableKeyException("Failed PKCS12" +
-                                        " integrity checking");
-                }
+                    if (debug != null) {
+                        debug.println("Checking keystore integrity " +
+                                "(" + m.getAlgorithm() + " iterations: " + ic + ")");
+                    }
+
+                    if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
+                        throw new UnrecoverableKeyException("Failed PKCS12" +
+                                " integrity checking");
+                    }
+                    return (Void)null;
+                }, password);
             } catch (Exception e) {
                 throw new IOException("Integrity check failed: " + e, e);
             }
@@ -2196,7 +2208,7 @@
         else return null;
     }
 
-    private void loadSafeContents(DerInputStream stream, char[] password)
+    private void loadSafeContents(DerInputStream stream)
         throws IOException, NoSuchAlgorithmException, CertificateException
     {
         DerValue[] safeBags = stream.getSequence(2);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/provider/KeyStoreDelegator.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/provider/KeyStoreDelegator.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/provider/KeyStoreDelegator.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/provider/KeyStoreDelegator.java	2021-09-01 14:33:15.000000000 +0000
@@ -265,6 +265,8 @@
                         throw (CertificateException)e;
                     } else if (e instanceof NoSuchAlgorithmException) {
                         throw (NoSuchAlgorithmException)e;
+                    } else if (e instanceof RuntimeException){
+                        throw (RuntimeException)e;
                     }
                 }
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSACore.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSACore.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSACore.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSACore.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -231,12 +231,14 @@
         if ((n == len + 1) && (b[0] == 0)) {
             byte[] t = new byte[len];
             System.arraycopy(b, 1, t, 0, len);
+            Arrays.fill(b, (byte)0);
             return t;
         }
         // must be smaller
         assert (n < len);
         byte[] t = new byte[len];
         System.arraycopy(b, 0, t, (len - n), n);
+        Arrays.fill(b, (byte)0);
         return t;
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSAPadding.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSAPadding.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSAPadding.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/rsa/RSAPadding.java	2021-09-01 14:33:15.000000000 +0000
@@ -238,28 +238,28 @@
     /**
      * Pad the data and return the padded block.
      */
-    public byte[] pad(byte[] data, int ofs, int len)
-            throws BadPaddingException {
-        return pad(RSACore.convert(data, ofs, len));
+    public byte[] pad(byte[] data) throws BadPaddingException {
+        return pad(data, 0, data.length);
     }
 
     /**
      * Pad the data and return the padded block.
      */
-    public byte[] pad(byte[] data) throws BadPaddingException {
-        if (data.length > maxDataSize) {
+    public byte[] pad(byte[] data, int ofs, int len)
+            throws BadPaddingException {
+        if (len > maxDataSize) {
             throw new BadPaddingException("Data must be shorter than "
                 + (maxDataSize + 1) + " bytes but received "
-                + data.length + " bytes.");
+                + len + " bytes.");
         }
         switch (type) {
         case PAD_NONE:
-            return data;
+            return RSACore.convert(data, ofs, len);
         case PAD_BLOCKTYPE_1:
         case PAD_BLOCKTYPE_2:
-            return padV15(data);
+            return padV15(data, ofs, len);
         case PAD_OAEP_MGF1:
-            return padOAEP(data);
+            return padOAEP(data, ofs, len);
         default:
             throw new AssertionError();
         }
@@ -268,14 +268,6 @@
     /**
      * Unpad the padded block and return the data.
      */
-    public byte[] unpad(byte[] padded, int ofs, int len)
-            throws BadPaddingException {
-        return unpad(RSACore.convert(padded, ofs, len));
-    }
-
-    /**
-     * Unpad the padded block and return the data.
-     */
     public byte[] unpad(byte[] padded) throws BadPaddingException {
         if (padded.length != paddedSize) {
             throw new BadPaddingException("Decryption error." +
@@ -298,11 +290,10 @@
     /**
      * PKCS#1 v1.5 padding (blocktype 1 and 2).
      */
-    private byte[] padV15(byte[] data) throws BadPaddingException {
+    private byte[] padV15(byte[] data, int ofs, int len) throws BadPaddingException {
         byte[] padded = new byte[paddedSize];
-        System.arraycopy(data, 0, padded, paddedSize - data.length,
-            data.length);
-        int psSize = paddedSize - 3 - data.length;
+        System.arraycopy(data, ofs, padded, paddedSize - len, len);
+        int psSize = paddedSize - 3 - len;
         int k = 0;
         padded[k++] = 0;
         padded[k++] = (byte)type;
@@ -389,7 +380,7 @@
      * PKCS#1 v2.0 OAEP padding (MGF1).
      * Paragraph references refer to PKCS#1 v2.1 (June 14, 2002)
      */
-    private byte[] padOAEP(byte[] M) throws BadPaddingException {
+    private byte[] padOAEP(byte[] M, int ofs, int len) throws BadPaddingException {
         if (random == null) {
             random = JCAUtil.getSecureRandom();
         }
@@ -416,7 +407,7 @@
         int dbLen = EM.length - dbStart;
 
         // start of message M in EM
-        int mStart = paddedSize - M.length;
+        int mStart = paddedSize - len;
 
         // build DB
         // 2.b: Concatenate lHash, PS, a single octet with hexadecimal value
@@ -425,7 +416,7 @@
         // (note that PS is all zeros)
         System.arraycopy(lHash, 0, EM, dbStart, hLen);
         EM[mStart - 1] = 1;
-        System.arraycopy(M, 0, EM, mStart, M.length);
+        System.arraycopy(M, ofs, EM, mStart, len);
 
         // produce maskedDB
         mgf.generateAndXor(EM, seedStart, seedLen, dbLen, EM, dbStart);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/AlpnExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/AlpnExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/AlpnExtension.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/AlpnExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -27,7 +27,10 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.Security;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -59,6 +62,20 @@
 
     static final SSLStringizer alpnStringizer = new AlpnStringizer();
 
+    // Encoding Charset to convert between String and byte[]
+    static final Charset alpnCharset;
+
+    static {
+        String alpnCharsetString = AccessController.doPrivileged(
+                (PrivilegedAction<String>) ()
+                        -> Security.getProperty("jdk.tls.alpnCharset"));
+        if ((alpnCharsetString == null)
+                || (alpnCharsetString.length() == 0)) {
+            alpnCharsetString = "ISO_8859_1";
+        }
+        alpnCharset = Charset.forName(alpnCharsetString);
+    }
+
     /**
      * The "application_layer_protocol_negotiation" extension.
      *
@@ -97,7 +114,7 @@
                         "extension: empty application protocol name");
                 }
 
-                String appProtocol = new String(bytes, StandardCharsets.UTF_8);
+                String appProtocol = new String(bytes, alpnCharset);
                 protocolNames.add(appProtocol);
             }
 
@@ -164,10 +181,10 @@
                 return null;
             }
 
-            // Produce the extension.
+            // Produce the extension:  first find the overall length
             int listLength = 0;     // ProtocolNameList length
             for (String ap : laps) {
-                int length = ap.getBytes(StandardCharsets.UTF_8).length;
+                int length = ap.getBytes(alpnCharset).length;
                 if (length == 0) {
                     // log the configuration problem
                     if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -219,8 +236,10 @@
             byte[] extData = new byte[listLength + 2];
             ByteBuffer m = ByteBuffer.wrap(extData);
             Record.putInt16(m, listLength);
+
+            // opaque ProtocolName<1..2^8-1>;
             for (String ap : laps) {
-                Record.putBytes8(m, ap.getBytes(StandardCharsets.UTF_8));
+                Record.putBytes8(m, ap.getBytes(alpnCharset));
             }
 
             // Update the context.
@@ -415,14 +434,14 @@
             }
 
             // opaque ProtocolName<1..2^8-1>, RFC 7301.
-            int listLen = shc.applicationProtocol.length() + 1;
-                                                        // 1: length byte
+            byte[] bytes = shc.applicationProtocol.getBytes(alpnCharset);
+            int listLen = bytes.length + 1;             // 1: length byte
+
             // ProtocolName protocol_name_list<2..2^16-1>, RFC 7301.
             byte[] extData = new byte[listLen + 2];     // 2: list length
             ByteBuffer m = ByteBuffer.wrap(extData);
             Record.putInt16(m, listLen);
-            Record.putBytes8(m,
-                    shc.applicationProtocol.getBytes(StandardCharsets.UTF_8));
+            Record.putBytes8(m, bytes);
 
             // Update the context.
             shc.conContext.applicationProtocol = shc.applicationProtocol;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.ssl;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.security.cert.X509Certificate;
+import java.text.MessageFormat;
+import java.util.*;
+import javax.net.ssl.SSLProtocolException;
+import javax.security.auth.x500.X500Principal;
+import sun.security.ssl.SSLExtension.ExtensionConsumer;
+import sun.security.ssl.SSLExtension.SSLExtensionSpec;
+import sun.security.ssl.SSLHandshake.HandshakeMessage;
+
+/**
+ * Pack of the "certificate_authorities" extensions.
+ */
+final class CertificateAuthoritiesExtension {
+    static final HandshakeProducer chNetworkProducer =
+            new CHCertificateAuthoritiesProducer();
+    static final ExtensionConsumer chOnLoadConsumer =
+            new CHCertificateAuthoritiesConsumer();
+
+    static final HandshakeProducer crNetworkProducer =
+            new CRCertificateAuthoritiesProducer();
+    static final ExtensionConsumer crOnLoadConsumer =
+            new CRCertificateAuthoritiesConsumer();
+
+    static final SSLStringizer ssStringizer =
+            new CertificateAuthoritiesStringizer();
+
+    /**
+     * The "certificate_authorities" extension.
+     */
+    static final class CertificateAuthoritiesSpec implements SSLExtensionSpec {
+        final List<byte[]> authorities;     // certificate authorities
+
+        private CertificateAuthoritiesSpec(List<byte[]> authorities) {
+            this.authorities = authorities;
+        }
+
+        private CertificateAuthoritiesSpec(ByteBuffer m) throws IOException  {
+            if (m.remaining() < 3) {        // 2: the length of the list
+                                            // 1: at least one byte authorities
+                throw new SSLProtocolException(
+                    "Invalid certificate_authorities extension: " +
+                    "insufficient data");
+            }
+
+            int listLen = Record.getInt16(m);
+            if (listLen == 0) {
+                throw new SSLProtocolException(
+                    "Invalid certificate_authorities extension: " +
+                    "no certificate authorities");
+            }
+
+            if (listLen > m.remaining()) {
+                throw new SSLProtocolException(
+                    "Invalid certificate_authorities extension: " +
+                    "insufficient data");
+            }
+
+            this.authorities = new LinkedList<>();
+            while (listLen > 0) {
+                // opaque DistinguishedName<1..2^16-1>;
+                byte[] encoded = Record.getBytes16(m);
+                listLen -= (2 + encoded.length);
+                authorities.add(encoded);
+            }
+        }
+
+        private static List<byte[]> getEncodedAuthorities(
+                X509Certificate[] trustedCerts) {
+            List<byte[]> authorities = new ArrayList<>(trustedCerts.length);
+            int sizeAccount = 0;
+            for (X509Certificate cert : trustedCerts) {
+                X500Principal x500Principal = cert.getSubjectX500Principal();
+                byte[] encodedPrincipal = x500Principal.getEncoded();
+                sizeAccount += encodedPrincipal.length;
+                if (sizeAccount > 0xFFFF) {  // the size limit of this extension
+                    // If there too many trusts CAs such that they exceed the
+                    // size limit of the extension, enabling this extension
+                    // does not really make sense as there is no way to
+                    // indicate the peer certificate selection accurately.
+                    // In such cases, the extension is just ignored, rather
+                    // than fatal close, for better compatibility and
+                    // interoperability.
+                    return Collections.emptyList();
+                }
+
+                if (encodedPrincipal.length != 0) {
+                    authorities.add(encodedPrincipal);
+                }
+            }
+
+            return authorities;
+        }
+
+        X500Principal[] getAuthorities() {
+            X500Principal[] principals = new X500Principal[authorities.size()];
+            int i = 0;
+            for (byte[] encoded : authorities) {
+                principals[i++] = new X500Principal(encoded);
+            }
+
+            return principals;
+        }
+
+        @Override
+        public String toString() {
+            MessageFormat messageFormat = new MessageFormat(
+                "\"certificate authorities\": '['\n{0}']'", Locale.ENGLISH);
+            StringBuilder builder = new StringBuilder(512);
+            for (byte[] encoded : authorities) {
+                X500Principal principal = new X500Principal(encoded);
+                builder.append(principal.toString());
+                builder.append("\n");
+            }
+            Object[] messageFields = {
+                Utilities.indent(builder.toString())
+            };
+
+            return messageFormat.format(messageFields);
+        }
+    }
+
+    private static final
+            class CertificateAuthoritiesStringizer implements SSLStringizer {
+        @Override
+        public String toString(ByteBuffer buffer) {
+            try {
+                return (new CertificateAuthoritiesSpec(buffer))
+                        .toString();
+            } catch (IOException ioe) {
+                // For debug logging only, so please swallow exceptions.
+                return ioe.getMessage();
+            }
+        }
+    }
+
+    /**
+     * Network data producer of a "certificate_authorities" extension in
+     * the ClientHello handshake message.
+     */
+    private static final
+        class CHCertificateAuthoritiesProducer implements HandshakeProducer {
+
+        // Prevent instantiation of this class.
+        private CHCertificateAuthoritiesProducer() {
+            // blank
+        }
+
+        @Override
+        public byte[] produce(ConnectionContext context,
+                HandshakeMessage message) throws IOException {
+            // The producing happens in client side only.
+            ClientHandshakeContext chc = (ClientHandshakeContext)context;
+
+            // Is it a supported and enabled extension?
+            if (!chc.sslConfig.isAvailable(
+                    SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "Ignore unavailable " +
+                            "certificate_authorities extension");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            // Produce the extension.
+            X509Certificate[] caCerts =
+                    chc.sslContext.getX509TrustManager().getAcceptedIssuers();
+            if (caCerts.length == 0) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "No available certificate authorities");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            List<byte[]> encodedCAs =
+                    CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
+            if (encodedCAs.isEmpty()) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.warning(
+                            "The number of CAs exceeds the maximum size" +
+                            "of the certificate_authorities extension");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            CertificateAuthoritiesSpec spec =
+                    new CertificateAuthoritiesSpec(encodedCAs);
+
+            int vectorLen = 0;
+            for (byte[] encoded : spec.authorities) {
+                vectorLen += encoded.length + 2;
+            }
+
+            byte[] extData = new byte[vectorLen + 2];
+            ByteBuffer m = ByteBuffer.wrap(extData);
+            Record.putInt16(m, vectorLen);
+            for (byte[] encoded : spec.authorities) {
+                Record.putBytes16(m, encoded);
+            }
+
+            // Update the context.
+            chc.handshakeExtensions.put(
+                    SSLExtension.CH_CERTIFICATE_AUTHORITIES, spec);
+
+            return extData;
+        }
+    }
+
+    /**
+     * Network data consumer of a "certificate_authorities" extension in
+     * the ClientHello handshake message.
+     */
+    private static final
+        class CHCertificateAuthoritiesConsumer implements ExtensionConsumer {
+
+        // Prevent instantiation of this class.
+        private CHCertificateAuthoritiesConsumer() {
+            // blank
+        }
+
+        @Override
+        public void consume(ConnectionContext context,
+            HandshakeMessage message, ByteBuffer buffer) throws IOException {
+
+            // The consuming happens in server side only.
+            ServerHandshakeContext shc = (ServerHandshakeContext)context;
+
+            // Is it a supported and enabled extension?
+            if (!shc.sslConfig.isAvailable(
+                    SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "Ignore unavailable " +
+                            "certificate_authorities extension");
+                }
+
+                return;     // ignore the extension
+            }
+
+            // Parse the extension.
+            CertificateAuthoritiesSpec spec =
+                    new CertificateAuthoritiesSpec(buffer);
+
+            // Update the context.
+            shc.peerSupportedAuthorities = spec.getAuthorities();
+            shc.handshakeExtensions.put(
+                    SSLExtension.CH_CERTIFICATE_AUTHORITIES, spec);
+
+            // No impact on session resumption.
+        }
+    }
+
+    /**
+     * Network data producer of a "certificate_authorities" extension in
+     * the CertificateRequest handshake message.
+     */
+    private static final
+        class CRCertificateAuthoritiesProducer implements HandshakeProducer {
+
+        // Prevent instantiation of this class.
+        private CRCertificateAuthoritiesProducer() {
+            // blank
+        }
+
+        @Override
+        public byte[] produce(ConnectionContext context,
+                HandshakeMessage message) throws IOException {
+            // The producing happens in server side only.
+            ServerHandshakeContext shc = (ServerHandshakeContext)context;
+
+            // Is it a supported and enabled extension?
+            if (!shc.sslConfig.isAvailable(
+                    SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "Ignore unavailable " +
+                            "certificate_authorities extension");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            // Produce the extension.
+            X509Certificate[] caCerts =
+                    shc.sslContext.getX509TrustManager().getAcceptedIssuers();
+            if (caCerts.length == 0) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "No available certificate authorities");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            List<byte[]> encodedCAs =
+                    CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
+            if (encodedCAs.isEmpty()) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.warning(
+                        "Too many certificate authorities to use " +
+                            "the certificate_authorities extension");
+                }
+
+                return null;    // ignore the extension
+            }
+
+            CertificateAuthoritiesSpec spec =
+                    new CertificateAuthoritiesSpec(encodedCAs);
+
+            int vectorLen = 0;
+            for (byte[] encoded : spec.authorities) {
+                vectorLen += encoded.length + 2;
+            }
+
+            byte[] extData = new byte[vectorLen + 2];
+            ByteBuffer m = ByteBuffer.wrap(extData);
+            Record.putInt16(m, vectorLen);
+            for (byte[] encoded : spec.authorities) {
+                Record.putBytes16(m, encoded);
+            }
+
+            // Update the context.
+            shc.handshakeExtensions.put(
+                    SSLExtension.CR_CERTIFICATE_AUTHORITIES, spec);
+
+            return extData;
+        }
+    }
+
+    /**
+     * Network data consumer of a "certificate_authorities" extension in
+     * the CertificateRequest handshake message.
+     */
+    private static final
+        class CRCertificateAuthoritiesConsumer implements ExtensionConsumer {
+
+        // Prevent instantiation of this class.
+        private CRCertificateAuthoritiesConsumer() {
+            // blank
+        }
+
+        @Override
+        public void consume(ConnectionContext context,
+            HandshakeMessage message, ByteBuffer buffer) throws IOException {
+
+            // The consuming happens in client side only.
+            ClientHandshakeContext chc = (ClientHandshakeContext)context;
+
+            // Is it a supported and enabled extension?
+            if (!chc.sslConfig.isAvailable(
+                    SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine(
+                            "Ignore unavailable " +
+                            "certificate_authorities extension");
+                }
+
+                return;     // ignore the extension
+            }
+
+            // Parse the extension.
+            CertificateAuthoritiesSpec spec =
+                    new CertificateAuthoritiesSpec(buffer);
+
+            // Update the context.
+            chc.peerSupportedAuthorities = spec.getAuthorities();
+            chc.handshakeExtensions.put(
+                    SSLExtension.CR_CERTIFICATE_AUTHORITIES, spec);
+
+            // No impact on session resumption.
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateRequest.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateRequest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateRequest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CertificateRequest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, 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
@@ -31,6 +31,7 @@
 import java.security.cert.X509Certificate;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -44,6 +45,7 @@
 import sun.security.ssl.CipherSuite.KeyExchange;
 import sun.security.ssl.SSLHandshake.HandshakeMessage;
 import sun.security.ssl.X509Authentication.X509Possession;
+import sun.security.ssl.X509Authentication.X509PossessionGenerator;
 
 /**
  * Pack of the CertificateRequest handshake message.
@@ -200,14 +202,13 @@
         }
 
         X500Principal[] getAuthorities() {
-            List<X500Principal> principals =
-                    new ArrayList<>(authorities.size());
+            X500Principal[] principals = new X500Principal[authorities.size()];
+            int i = 0;
             for (byte[] encoded : authorities) {
-                X500Principal principal = new X500Principal(encoded);
-                principals.add(principal);
+                principals[i++] = new X500Principal(encoded);
             }
 
-            return principals.toArray(new X500Principal[0]);
+            return principals;
         }
 
         @Override
@@ -329,6 +330,16 @@
 
             // clean up this consumer
             chc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE_REQUEST.id);
+            chc.receivedCertReq = true;
+
+            // If we're processing this message and the server's certificate
+            // message consumer has not already run then this is a state
+            // machine violation.
+            if (chc.handshakeConsumers.containsKey(
+                    SSLHandshake.CERTIFICATE.id)) {
+                throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        "Unexpected CertificateRequest handshake message");
+            }
 
             SSLConsumer certStatCons = chc.handshakeConsumers.remove(
                     SSLHandshake.CERTIFICATE_STATUS.id);
@@ -504,14 +515,13 @@
         }
 
         X500Principal[] getAuthorities() {
-            List<X500Principal> principals =
-                    new ArrayList<>(authorities.size());
+            X500Principal[] principals = new X500Principal[authorities.size()];
+            int i = 0;
             for (byte[] encoded : authorities) {
-                X500Principal principal = new X500Principal(encoded);
-                principals.add(principal);
+                principals[i++] = new X500Principal(encoded);
             }
 
-            return principals.toArray(new X500Principal[0]);
+            return principals;
         }
 
         @Override
@@ -656,6 +666,16 @@
 
             // clean up this consumer
             chc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE_REQUEST.id);
+            chc.receivedCertReq = true;
+
+            // If we're processing this message and the server's certificate
+            // message consumer has not already run then this is a state
+            // machine violation.
+            if (chc.handshakeConsumers.containsKey(
+                    SSLHandshake.CERTIFICATE.id)) {
+                throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        "Unexpected CertificateRequest handshake message");
+            }
 
             SSLConsumer certStatCons = chc.handshakeConsumers.remove(
                     SSLHandshake.CERTIFICATE_STATUS.id);
@@ -698,12 +718,11 @@
             chc.handshakeSession.setPeerSupportedSignatureAlgorithms(sss);
             chc.peerSupportedAuthorities = crm.getAuthorities();
 
-            // For TLS 1.2, we no longer use the certificate_types field
-            // from the CertificateRequest message to directly determine
-            // the SSLPossession.  Instead, the choosePossession method
-            // will use the accepted signature schemes in the message to
-            // determine the set of acceptable certificate types to select from.
-            SSLPossession pos = choosePossession(chc);
+            // For TLS 1.2, we need to use a combination of the CR message's
+            // allowed key types and the signature algorithms in order to
+            // find a certificate chain that has the right key and all certs
+            // using one or more of the allowed cert signature schemes.
+            SSLPossession pos = choosePossession(chc, crm);
             if (pos == null) {
                 return;
             }
@@ -713,8 +732,8 @@
                     SSLHandshake.CERTIFICATE_VERIFY);
         }
 
-        private static SSLPossession choosePossession(HandshakeContext hc)
-                throws IOException {
+        private static SSLPossession choosePossession(HandshakeContext hc,
+                T12CertificateRequestMessage crm) throws IOException {
             if (hc.peerRequestedCertSignSchemes == null ||
                     hc.peerRequestedCertSignSchemes.isEmpty()) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -724,6 +743,9 @@
                 return null;
             }
 
+            // Put the CR key type into a more friendly format for searching
+            List<String> crKeyTypes = Arrays.asList(crm.getKeyTypes());
+
             Collection<String> checkedKeyTypes = new HashSet<>();
             for (SignatureScheme ss : hc.peerRequestedCertSignSchemes) {
                 if (checkedKeyTypes.contains(ss.keyAlgorithm)) {
@@ -749,7 +771,7 @@
                     continue;
                 }
 
-                SSLAuthentication ka = X509Authentication.valueOf(ss);
+                X509Authentication ka = X509Authentication.valueOf(ss);
                 if (ka == null) {
                     if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
@@ -757,6 +779,27 @@
                     }
                     checkedKeyTypes.add(ss.keyAlgorithm);
                     continue;
+                } else {
+                    // Any auth object will have a possession generator and
+                    // we need to make sure the key types for that generator
+                    // share at least one common algorithm with the CR's
+                    // allowed key types.
+                    if (ka.possessionGenerator instanceof
+                            X509PossessionGenerator) {
+                        X509PossessionGenerator xpg =
+                            (X509PossessionGenerator) ka.possessionGenerator;
+                        if (Collections.disjoint(crKeyTypes,
+                                Arrays.asList(xpg.keyTypes))) {
+                            if (SSLLogger.isOn &&
+                                    SSLLogger.isOn("ssl,handshake")) {
+                                SSLLogger.warning(
+                                        "Unsupported authentication scheme: " +
+                                                ss.name);
+                            }
+                            checkedKeyTypes.add(ss.keyAlgorithm);
+                            continue;
+                        }
+                    }
                 }
 
                 SSLPossession pos = ka.createPossession(hc);
@@ -919,6 +962,15 @@
 
             // clean up this consumer
             chc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE_REQUEST.id);
+            chc.receivedCertReq = true;
+
+            // Ensure that the CertificateRequest has not been sent prior
+            // to EncryptedExtensions
+            if (chc.handshakeConsumers.containsKey(
+                    SSLHandshake.ENCRYPTED_EXTENSIONS.id)) {
+                throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        "Unexpected CertificateRequest handshake message");
+            }
 
             T13CertificateRequestMessage crm =
                     new T13CertificateRequestMessage(chc, message);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CipherSuite.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CipherSuite.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/CipherSuite.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/CipherSuite.java	2021-09-01 14:33:15.000000000 +0000
@@ -56,20 +56,22 @@
     // the following criteria:
     // 1. Prefer Suite B compliant cipher suites, see RFC6460 (To be
     //    changed later, see below).
-    // 2. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
+    // 2. Prefer forward secrecy cipher suites.
+    // 3. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
     //    AES_128(GCM), AES_256, AES_128, 3DES-EDE.
-    // 3. Prefer the stronger MAC algorithm, in the order of SHA384,
+    // 4. Prefer the stronger MAC algorithm, in the order of SHA384,
     //    SHA256, SHA, MD5.
-    // 4. Prefer the better performance of key exchange and digital
+    // 5. Prefer the better performance of key exchange and digital
     //    signature algorithm, in the order of ECDHE-ECDSA, ECDHE-RSA,
-    //    RSA, ECDH-ECDSA, ECDH-RSA, DHE-RSA, DHE-DSS.
+    //    DHE-RSA, DHE-DSS, ECDH-ECDSA, ECDH-RSA, RSA.
 
-    TLS_AES_128_GCM_SHA256(
-            0x1301, true, "TLS_AES_128_GCM_SHA256",
-            ProtocolVersion.PROTOCOLS_OF_13, B_AES_128_GCM_IV, H_SHA256),
+    // TLS 1.3 cipher suites.
     TLS_AES_256_GCM_SHA384(
             0x1302, true, "TLS_AES_256_GCM_SHA384",
             ProtocolVersion.PROTOCOLS_OF_13, B_AES_256_GCM_IV, H_SHA384),
+    TLS_AES_128_GCM_SHA256(
+            0x1301, true, "TLS_AES_128_GCM_SHA256",
+            ProtocolVersion.PROTOCOLS_OF_13, B_AES_128_GCM_IV, H_SHA256),
 
     // Suite B compliant cipher suites, see RFC 6460.
     //
@@ -87,23 +89,23 @@
             ProtocolVersion.PROTOCOLS_OF_12,
             K_ECDHE_ECDSA, B_AES_128_GCM, M_NULL, H_SHA256),
 
-    // AES_256(GCM)
+    //
+    // Forward screcy cipher suites.
+    //
+
+    // AES_256(GCM) - ECDHE
     TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384(
             0xC030, true, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
             K_ECDHE_RSA, B_AES_256_GCM, M_NULL, H_SHA384),
-    TLS_RSA_WITH_AES_256_GCM_SHA384(
-            0x009D, true, "TLS_RSA_WITH_AES_256_GCM_SHA384", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_RSA, B_AES_256_GCM, M_NULL, H_SHA384),
-    TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384(
-            0xC02E, true, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_ECDSA, B_AES_256_GCM, M_NULL, H_SHA384),
-    TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384(
-            0xC032, true, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384", "",
+
+    // AES_128(GCM) - ECDHE
+    TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256(
+            0xC02F, true, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "",
             ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_RSA, B_AES_256_GCM, M_NULL, H_SHA384),
+            K_ECDHE_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
+
+    // AES_256(GCM) - DHE
     TLS_DHE_RSA_WITH_AES_256_GCM_SHA384(
             0x009F, true, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
@@ -113,23 +115,7 @@
             ProtocolVersion.PROTOCOLS_OF_12,
             K_DHE_DSS, B_AES_256_GCM, M_NULL, H_SHA384),
 
-    // AES_128(GCM)
-    TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256(
-            0xC02F, true, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDHE_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
-    TLS_RSA_WITH_AES_128_GCM_SHA256(
-            0x009C, true, "TLS_RSA_WITH_AES_128_GCM_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
-    TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256(
-            0xC02D, true, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_ECDSA, B_AES_128_GCM, M_NULL, H_SHA256),
-    TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256(
-            0xC031, true, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
+    // AES_128(GCM) - DHE
     TLS_DHE_RSA_WITH_AES_128_GCM_SHA256(
             0x009E, true, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", "",
             ProtocolVersion.PROTOCOLS_OF_12,
@@ -139,7 +125,7 @@
             ProtocolVersion.PROTOCOLS_OF_12,
             K_DHE_DSS, B_AES_128_GCM, M_NULL, H_SHA256),
 
-    // AES_256(CBC)
+    // AES_256(CBC) - ECDHE
     TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384(
             0xC024, true, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
@@ -148,10 +134,62 @@
             0xC028, true, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
             K_ECDHE_RSA, B_AES_256, M_SHA384, H_SHA384),
-    TLS_RSA_WITH_AES_256_CBC_SHA256(
-            0x003D, true, "TLS_RSA_WITH_AES_256_CBC_SHA256", "",
+
+    // AES_128(CBC) - ECDHE
+    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256(
+            0xC023, true, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", "",
             ProtocolVersion.PROTOCOLS_OF_12,
-            K_RSA, B_AES_256, M_SHA256, H_SHA256),
+            K_ECDHE_ECDSA, B_AES_128, M_SHA256, H_SHA256),
+    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256(
+            0xC027, true, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_ECDHE_RSA, B_AES_128, M_SHA256, H_SHA256),
+
+    // AES_256(CBC) - DHE
+    TLS_DHE_RSA_WITH_AES_256_CBC_SHA256(
+            0x006B, true, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_DHE_RSA, B_AES_256, M_SHA256, H_SHA256),
+    TLS_DHE_DSS_WITH_AES_256_CBC_SHA256(
+            0x006A, true, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_DHE_DSS, B_AES_256, M_SHA256, H_SHA256),
+
+    // AES_128(CBC) - DHE
+    TLS_DHE_RSA_WITH_AES_128_CBC_SHA256(
+            0x0067, true, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_DHE_RSA, B_AES_128, M_SHA256, H_SHA256),
+    TLS_DHE_DSS_WITH_AES_128_CBC_SHA256(
+            0x0040, true, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_DHE_DSS, B_AES_128, M_SHA256, H_SHA256),
+
+    //
+    // not forward screcy cipher suites.
+    //
+
+    // AES_256(GCM)
+    TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384(
+            0xC02E, true, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_ECDH_ECDSA, B_AES_256_GCM, M_NULL, H_SHA384),
+    TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384(
+            0xC032, true, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_ECDH_RSA, B_AES_256_GCM, M_NULL, H_SHA384),
+
+    // AES_128(GCM)
+    TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256(
+            0xC02D, true, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_ECDH_ECDSA, B_AES_128_GCM, M_NULL, H_SHA256),
+    TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256(
+            0xC031, true, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_ECDH_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
+
+    // AES_256(CBC)
     TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384(
             0xC026, true, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
@@ -160,15 +198,22 @@
             0xC02A, true, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384", "",
             ProtocolVersion.PROTOCOLS_OF_12,
             K_ECDH_RSA, B_AES_256, M_SHA384, H_SHA384),
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA256(
-            0x006B, true, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256", "",
+
+    // AES_128(CBC)
+    TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256(
+            0xC025, true, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256", "",
             ProtocolVersion.PROTOCOLS_OF_12,
-            K_DHE_RSA, B_AES_256, M_SHA256, H_SHA256),
-    TLS_DHE_DSS_WITH_AES_256_CBC_SHA256(
-            0x006A, true, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256", "",
+            K_ECDH_ECDSA, B_AES_128, M_SHA256, H_SHA256),
+    TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256(
+            0xC029, true, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256", "",
             ProtocolVersion.PROTOCOLS_OF_12,
-            K_DHE_DSS, B_AES_256, M_SHA256, H_SHA256),
+            K_ECDH_RSA, B_AES_128, M_SHA256, H_SHA256),
+
+    //
+    // Legacy, used for compatibility
+    //
 
+    // AES_256(CBC) - ECDHE - Using SHA
     TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA(
             0xC00A, true, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
@@ -177,18 +222,18 @@
             0xC014, true, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
             K_ECDHE_RSA, B_AES_256, M_SHA, H_SHA256),
-    TLS_RSA_WITH_AES_256_CBC_SHA(
-            0x0035, true, "TLS_RSA_WITH_AES_256_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_RSA, B_AES_256, M_SHA, H_SHA256),
-    TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA(
-            0xC005, true, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA", "",
+
+    // AES_128(CBC) - ECDHE - using SHA
+    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA(
+            0xC009, true, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_ECDSA, B_AES_256, M_SHA, H_SHA256),
-    TLS_ECDH_RSA_WITH_AES_256_CBC_SHA(
-            0xC00F, true, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA", "",
+            K_ECDHE_ECDSA, B_AES_128, M_SHA, H_SHA256),
+    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA(
+            0xC013, true, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_RSA, B_AES_256, M_SHA, H_SHA256),
+            K_ECDHE_RSA, B_AES_128, M_SHA, H_SHA256),
+
+    // AES_256(CBC) - DHE - Using SHA
     TLS_DHE_RSA_WITH_AES_256_CBC_SHA(
             0x0039, true, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
@@ -198,48 +243,27 @@
             ProtocolVersion.PROTOCOLS_TO_12,
             K_DHE_DSS, B_AES_256, M_SHA, H_SHA256),
 
-    // AES_128(CBC)
-    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256(
-            0xC023, true, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDHE_ECDSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256(
-            0xC027, true, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDHE_RSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_RSA_WITH_AES_128_CBC_SHA256(
-            0x003C, true, "TLS_RSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_RSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256(
-            0xC025, true, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_ECDSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256(
-            0xC029, true, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_ECDH_RSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA256(
-            0x0067, true, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_DHE_RSA, B_AES_128, M_SHA256, H_SHA256),
-    TLS_DHE_DSS_WITH_AES_128_CBC_SHA256(
-            0x0040, true, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256", "",
-            ProtocolVersion.PROTOCOLS_OF_12,
-            K_DHE_DSS, B_AES_128, M_SHA256, H_SHA256),
-
-    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA(
-            0xC009, true, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", "",
+    // AES_128(CBC) - DHE - using SHA
+    TLS_DHE_RSA_WITH_AES_128_CBC_SHA(
+            0x0033, true, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDHE_ECDSA, B_AES_128, M_SHA, H_SHA256),
-    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA(
-            0xC013, true, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "",
+            K_DHE_RSA, B_AES_128, M_SHA, H_SHA256),
+    TLS_DHE_DSS_WITH_AES_128_CBC_SHA(
+            0x0032, true, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDHE_RSA, B_AES_128, M_SHA, H_SHA256),
-    TLS_RSA_WITH_AES_128_CBC_SHA(
-            0x002F, true, "TLS_RSA_WITH_AES_128_CBC_SHA", "",
+            K_DHE_DSS, B_AES_128, M_SHA, H_SHA256),
+
+    // AES_256(CBC) - using SHA, not forward screcy
+    TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA(
+            0xC005, true, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_RSA, B_AES_128, M_SHA, H_SHA256),
+            K_ECDH_ECDSA, B_AES_256, M_SHA, H_SHA256),
+    TLS_ECDH_RSA_WITH_AES_256_CBC_SHA(
+            0xC00F, true, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDH_RSA, B_AES_256, M_SHA, H_SHA256),
+
+    // AES_128(CBC) - using SHA, not forward screcy
     TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA(
             0xC004, true, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
@@ -248,16 +272,48 @@
             0xC00E, true, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
             K_ECDH_RSA, B_AES_128, M_SHA, H_SHA256),
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA(
-            0x0033, true, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "",
+
+    //
+    // deprecated, used for compatibility
+    //
+
+    // RSA, AES_256(GCM)
+    TLS_RSA_WITH_AES_256_GCM_SHA384(
+            0x009D, true, "TLS_RSA_WITH_AES_256_GCM_SHA384", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_RSA, B_AES_256_GCM, M_NULL, H_SHA384),
+
+    // RSA, AES_128(GCM)
+    TLS_RSA_WITH_AES_128_GCM_SHA256(
+            0x009C, true, "TLS_RSA_WITH_AES_128_GCM_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_RSA, B_AES_128_GCM, M_NULL, H_SHA256),
+
+    // RSA, AES_256(CBC)
+    TLS_RSA_WITH_AES_256_CBC_SHA256(
+            0x003D, true, "TLS_RSA_WITH_AES_256_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_RSA, B_AES_256, M_SHA256, H_SHA256),
+
+    // RSA, AES_128(CBC)
+    TLS_RSA_WITH_AES_128_CBC_SHA256(
+            0x003C, true, "TLS_RSA_WITH_AES_128_CBC_SHA256", "",
+            ProtocolVersion.PROTOCOLS_OF_12,
+            K_RSA, B_AES_128, M_SHA256, H_SHA256),
+
+    // RSA, AES_256(CBC) - using SHA, not forward screcy
+    TLS_RSA_WITH_AES_256_CBC_SHA(
+            0x0035, true, "TLS_RSA_WITH_AES_256_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_DHE_RSA, B_AES_128, M_SHA, H_SHA256),
-    TLS_DHE_DSS_WITH_AES_128_CBC_SHA(
-            0x0032, true, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "",
+            K_RSA, B_AES_256, M_SHA, H_SHA256),
+
+    // RSA, AES_128(CBC) - using SHA, not forward screcy
+    TLS_RSA_WITH_AES_128_CBC_SHA(
+            0x002F, true, "TLS_RSA_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
-            K_DHE_DSS, B_AES_128, M_SHA, H_SHA256),
+            K_RSA, B_AES_128, M_SHA, H_SHA256),
 
-    // 3DES_EDE
+    // 3DES_EDE, forward secrecy.
     TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA(
             0xC008, true, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
@@ -266,19 +322,6 @@
             0xC012, true, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
             K_ECDHE_RSA, B_3DES, M_SHA, H_SHA256),
-    SSL_RSA_WITH_3DES_EDE_CBC_SHA(
-            0x000A, true, "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-                          "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_RSA, B_3DES, M_SHA, H_SHA256),
-    TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA(
-            0xC003, true, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_ECDSA, B_3DES, M_SHA, H_SHA256),
-    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA(
-            0xC00D, true, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_RSA, B_3DES, M_SHA, H_SHA256),
     SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
             0x0016, true, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
                           "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -290,6 +333,21 @@
             ProtocolVersion.PROTOCOLS_TO_12,
             K_DHE_DSS, B_3DES, M_SHA, H_SHA256),
 
+    // 3DES_EDE, not forward secrecy.
+    TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA(
+            0xC003, true, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDH_ECDSA, B_3DES, M_SHA, H_SHA256),
+    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA(
+            0xC00D, true, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDH_RSA, B_3DES, M_SHA, H_SHA256),
+    SSL_RSA_WITH_3DES_EDE_CBC_SHA(
+            0x000A, true, "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
+                          "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_RSA, B_3DES, M_SHA, H_SHA256),
+
     // Renegotiation protection request Signalling Cipher Suite Value (SCSV).
     TLS_EMPTY_RENEGOTIATION_INFO_SCSV(        //  RFC 5746, TLS 1.2 and prior
             0x00FF, true, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV", "",
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/Ciphertext.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/Ciphertext.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/Ciphertext.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/Ciphertext.java	2021-09-01 14:33:15.000000000 +0000
@@ -31,8 +31,6 @@
  * Ciphertext
  */
 final class Ciphertext {
-    static final Ciphertext CIPHERTEXT_NULL = new Ciphertext();
-
     final byte contentType;
     final byte handshakeType;
     final long recordSN;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ClientHandshakeContext.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ClientHandshakeContext.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ClientHandshakeContext.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ClientHandshakeContext.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -90,6 +90,11 @@
 
     ClientHelloMessage initialClientHelloMsg = null;
 
+    // Flag to indicate receipt of a CertificateRequest message from
+    // the server.  Because this is optional, we cannot guarantee
+    // the handshakeConsumers Map will always have it present there.
+    boolean receivedCertReq = false;
+
     // PSK identity is selected in first Hello and used again after HRR
     byte[] pskIdentity;
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java	2021-09-01 14:33:15.000000000 +0000
@@ -105,9 +105,10 @@
                         (ECPublicKey)kf.generatePublic(spec);
 
                 // check constraints of ECPublicKey
-                if (!constraints.permits(
-                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                        peerPublicKey)) {
+                if (constraints != null &&
+                        !constraints.permits(
+                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                peerPublicKey)) {
                     throw new SSLHandshakeException(
                         "ECPublicKey does not comply to algorithm constraints");
                 }
@@ -324,9 +325,10 @@
                         (ECPublicKey)kf.generatePublic(spec);
 
                 // check constraints of peer ECPublicKey
-                if (!shc.algorithmConstraints.permits(
-                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                        peerPublicKey)) {
+                if (shc.algorithmConstraints != null &&
+                        !shc.algorithmConstraints.permits(
+                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                peerPublicKey)) {
                     throw new SSLHandshakeException(
                         "ECPublicKey does not comply to algorithm constraints");
                 }
@@ -498,9 +500,10 @@
                         (ECPublicKey)kf.generatePublic(spec);
 
                 // check constraints of peer ECPublicKey
-                if (!shc.algorithmConstraints.permits(
-                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                        peerPublicKey)) {
+                if (shc.algorithmConstraints != null &&
+                        !shc.algorithmConstraints.permits(
+                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                peerPublicKey)) {
                     throw new SSLHandshakeException(
                         "ECPublicKey does not comply to algorithm constraints");
                 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHServerKeyExchange.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHServerKeyExchange.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ECDHServerKeyExchange.java	2021-09-01 14:33:15.000000000 +0000
@@ -535,9 +535,10 @@
             // validate
             //
             // check constraints of EC PublicKey
-            if (!chc.algorithmConstraints.permits(
-                    EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                    skem.publicKey)) {
+            if (chc.algorithmConstraints != null &&
+                    !chc.algorithmConstraints.permits(
+                            EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                            skem.publicKey)) {
                 throw chc.conContext.fatal(Alert.INSUFFICIENT_SECURITY,
                         "ECDH ServerKeyExchange does not comply " +
                         "to algorithm constraints");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/HelloCookieManager.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/HelloCookieManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/HelloCookieManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/HelloCookieManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -180,7 +180,7 @@
             md.update(headerBytes);
             byte[] headerCookie = md.digest(secret);
 
-            if (!Arrays.equals(headerCookie, prevHeadCookie)) {
+            if (!MessageDigest.isEqual(headerCookie, prevHeadCookie)) {
                 return false;
             }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/KeyShareExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/KeyShareExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/KeyShareExtension.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/KeyShareExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -345,7 +345,8 @@
                 NamedGroup ng = NamedGroup.valueOf(entry.namedGroupId);
                 if (ng == null || !SupportedGroups.isActivatable(
                         shc.algorithmConstraints, ng)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn &&
+                            SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "Ignore unsupported named group: " +
                                 NamedGroup.nameOf(entry.namedGroupId));
@@ -358,40 +359,52 @@
                         ECDHECredentials ecdhec =
                             ECDHECredentials.valueOf(ng, entry.keyExchange);
                         if (ecdhec != null) {
-                            if (!shc.algorithmConstraints.permits(
-                                    EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                                    ecdhec.popPublicKey)) {
-                                SSLLogger.warning(
-                                        "ECDHE key share entry does not " +
-                                        "comply to algorithm constraints");
+                            if (shc.algorithmConstraints != null &&
+                                    !shc.algorithmConstraints.permits(
+                                            EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                            ecdhec.popPublicKey)) {
+                                if (SSLLogger.isOn &&
+                                        SSLLogger.isOn("ssl,handshake")) {
+                                    SSLLogger.warning(
+                                            "ECDHE key share entry does not " +
+                                            "comply to algorithm constraints");
+                                }
                             } else {
                                 credentials.add(ecdhec);
                             }
                         }
                     } catch (IOException | GeneralSecurityException ex) {
-                        SSLLogger.warning(
-                                "Cannot decode named group: " +
-                                NamedGroup.nameOf(entry.namedGroupId));
+                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                            SSLLogger.warning(
+                                    "Cannot decode named group: " +
+                                    NamedGroup.nameOf(entry.namedGroupId));
+                        }
                     }
                 } else if (ng.type == NamedGroupType.NAMED_GROUP_FFDHE) {
                     try {
                         DHECredentials dhec =
                                 DHECredentials.valueOf(ng, entry.keyExchange);
                         if (dhec != null) {
-                            if (!shc.algorithmConstraints.permits(
-                                    EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                                    dhec.popPublicKey)) {
-                                SSLLogger.warning(
-                                        "DHE key share entry does not " +
-                                        "comply to algorithm constraints");
+                            if (shc.algorithmConstraints != null &&
+                                    !shc.algorithmConstraints.permits(
+                                            EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                            dhec.popPublicKey)) {
+                                if (SSLLogger.isOn &&
+                                        SSLLogger.isOn("ssl,handshake")) {
+                                    SSLLogger.warning(
+                                            "DHE key share entry does not " +
+                                            "comply to algorithm constraints");
+                                }
                             } else {
                                 credentials.add(dhec);
                             }
                         }
                     } catch (IOException | GeneralSecurityException ex) {
-                        SSLLogger.warning(
-                                "Cannot decode named group: " +
-                                NamedGroup.nameOf(entry.namedGroupId));
+                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                            SSLLogger.warning(
+                                    "Cannot decode named group: " +
+                                    NamedGroup.nameOf(entry.namedGroupId));
+                        }
                     }
                 }
             }
@@ -648,10 +661,11 @@
                     ECDHECredentials ecdhec =
                             ECDHECredentials.valueOf(ng, keyShare.keyExchange);
                     if (ecdhec != null) {
-                        if (!chc.algorithmConstraints.permits(
-                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                                ecdhec.popPublicKey)) {
-                            throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        if (chc.algorithmConstraints != null &&
+                                !chc.algorithmConstraints.permits(
+                                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                        ecdhec.popPublicKey)) {
+                            throw chc.conContext.fatal(Alert.INSUFFICIENT_SECURITY,
                                     "ECDHE key share entry does not " +
                                     "comply to algorithm constraints");
                         } else {
@@ -668,10 +682,11 @@
                     DHECredentials dhec =
                             DHECredentials.valueOf(ng, keyShare.keyExchange);
                     if (dhec != null) {
-                        if (!chc.algorithmConstraints.permits(
-                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                                dhec.popPublicKey)) {
-                            throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        if (chc.algorithmConstraints != null &&
+                                !chc.algorithmConstraints.permits(
+                                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                                        dhec.popPublicKey)) {
+                            throw chc.conContext.fatal(Alert.INSUFFICIENT_SECURITY,
                                     "DHE key share entry does not " +
                                     "comply to algorithm constraints");
                         } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/PreSharedKeyExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/PreSharedKeyExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/PreSharedKeyExtension.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/PreSharedKeyExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Locale;
-import java.util.Arrays;
 import java.util.Objects;
 import java.util.Collection;
 import javax.crypto.Mac;
@@ -369,7 +368,7 @@
                         shc.sslContext.engineGetServerSessionContext();
                 int idIndex = 0;
                 for (PskIdentity requestedId : pskSpec.identities) {
-                    SSLSessionImpl s = sessionCache.get(requestedId.identity);
+                    SSLSessionImpl s = sessionCache.pull(requestedId.identity);
                     if (s != null && canRejoin(clientHello, shc, s)) {
                         if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.fine("Resuming session: ", s);
@@ -539,7 +538,7 @@
         SecretKey binderKey = deriveBinderKey(shc, psk, session);
         byte[] computedBinder =
                 computeBinder(shc, binderKey, session, pskBinderHash);
-        if (!Arrays.equals(binder, computedBinder)) {
+        if (!MessageDigest.isEqual(binder, computedBinder)) {
             throw shc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
                     "Incorect PSK binder value");
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/RandomCookie.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/RandomCookie.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/RandomCookie.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/RandomCookie.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,10 +25,12 @@
 
 package sun.security.ssl;
 
+import sun.security.util.ByteArrays;
+
 import java.io.*;
 import java.nio.ByteBuffer;
+import java.security.MessageDigest;
 import java.security.SecureRandom;
-import java.util.Arrays;
 
 /*
  * RandomCookie ... SSL hands standard format random cookies (nonces)
@@ -111,7 +113,7 @@
     }
 
     boolean isHelloRetryRequest() {
-        return Arrays.equals(hrrRandomBytes, randomBytes);
+        return MessageDigest.isEqual(hrrRandomBytes, randomBytes);
     }
 
     // Used for client random validation of version downgrade protection.
@@ -130,10 +132,10 @@
     }
 
     private boolean isT12Downgrade() {
-        return Utilities.equals(randomBytes, 24, 32, t12Protection, 0, 8);
+        return ByteArrays.isEqual(randomBytes, 24, 32, t12Protection, 0, 8);
     }
 
     private boolean isT11Downgrade() {
-        return Utilities.equals(randomBytes, 24, 32, t11Protection, 0, 8);
+        return ByteArrays.isEqual(randomBytes, 24, 32, t11Protection, 0, 8);
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/RenegoInfoExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/RenegoInfoExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/RenegoInfoExtension.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/RenegoInfoExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -27,6 +27,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.security.MessageDigest;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Locale;
@@ -37,6 +38,7 @@
 import static sun.security.ssl.SSLExtension.SH_RENEGOTIATION_INFO;
 import sun.security.ssl.SSLExtension.SSLExtensionSpec;
 import sun.security.ssl.SSLHandshake.HandshakeMessage;
+import sun.security.util.ByteArrays;
 
 /**
  * Pack of the "renegotiation_info" extensions [RFC 5746].
@@ -243,7 +245,7 @@
                             "renegotiation");
                 } else {
                     // verify the client_verify_data value
-                    if (!Arrays.equals(shc.conContext.clientVerifyData,
+                    if (!MessageDigest.isEqual(shc.conContext.clientVerifyData,
                             spec.renegotiatedConnection)) {
                         throw shc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
                             "Invalid renegotiation_info extension data: " +
@@ -470,14 +472,14 @@
                 }
 
                 byte[] cvd = chc.conContext.clientVerifyData;
-                if (!Utilities.equals(spec.renegotiatedConnection,
+                if (!ByteArrays.isEqual(spec.renegotiatedConnection,
                         0, cvd.length, cvd, 0, cvd.length)) {
                     throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Invalid renegotiation_info in ServerHello: " +
                         "unmatched client_verify_data value");
                 }
                 byte[] svd = chc.conContext.serverVerifyData;
-                if (!Utilities.equals(spec.renegotiatedConnection,
+                if (!ByteArrays.isEqual(spec.renegotiatedConnection,
                         cvd.length, infoLen, svd, 0, svd.length)) {
                     throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Invalid renegotiation_info in ServerHello: " +
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerHello.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerHello.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerHello.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerHello.java	2021-09-01 14:33:15.000000000 +0000
@@ -547,11 +547,6 @@
 
                 setUpPskKD(shc,
                         shc.resumingSession.consumePreSharedKey());
-
-                // The session can't be resumed again---remove it from cache
-                SSLSessionContextImpl sessionCache = (SSLSessionContextImpl)
-                    shc.sslContext.engineGetServerSessionContext();
-                sessionCache.remove(shc.resumingSession.getSessionId());
             }
 
             // update the responders
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerKeyExchange.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerKeyExchange.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerKeyExchange.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/ServerKeyExchange.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 20121, 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
@@ -92,6 +92,17 @@
             // clean up this consumer
             chc.handshakeConsumers.remove(SSLHandshake.SERVER_KEY_EXCHANGE.id);
 
+            // Any receipt/consumption of the CertificateRequest before
+            // ServerKeyExchange is a state machine violation.  We may not
+            // know for sure if an early CR message is a violation though until
+            // we have reached this point, due to other TLS features and
+            // optional messages.
+            if (chc.receivedCertReq) {
+                chc.receivedCertReq = false;    // Reset flag
+                throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                        "Unexpected ServerKeyExchange handshake message");
+            }
+
             SSLConsumer certStatCons = chc.handshakeConsumers.remove(
                     SSLHandshake.CERTIFICATE_STATUS.id);
             if (certStatCons != null) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SessionId.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SessionId.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SessionId.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SessionId.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,6 +25,7 @@
 
 package sun.security.ssl;
 
+import java.security.MessageDigest;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import javax.net.ssl.SSLProtocolException;
@@ -89,7 +90,7 @@
 
         if (obj instanceof SessionId) {
             SessionId that = (SessionId)obj;
-            return Arrays.equals(this.sessionId, that.sessionId);
+            return MessageDigest.isEqual(this.sessionId, that.sessionId);
         }
 
         return false;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -227,6 +227,19 @@
             hsStatus = ciphertext.handshakeStatus;
         } else {
             hsStatus = getHandshakeStatus();
+            if (ciphertext == null && !conContext.isNegotiated &&
+                    conContext.isInboundClosed() &&
+                    hsStatus == HandshakeStatus.NEED_WRAP) {
+                // Even the outboud is open, no futher data could be wrapped as:
+                //     1. the outbound is empty
+                //     2. no negotiated connection
+                //     3. the inbound has closed, cannot complete the handshake
+                //
+                // Mark the engine as closed if the handshake status is
+                // NEED_WRAP. Otherwise, it could lead to dead loops in
+                // applications.
+                status = Status.CLOSED;
+            }
         }
 
         int deltaSrcs = srcsRemains;
@@ -258,7 +271,7 @@
         }
 
         if (ciphertext == null) {
-            return Ciphertext.CIPHERTEXT_NULL;
+            return null;
         }
 
         // Is the handshake completed?
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineInputRecord.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineInputRecord.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineInputRecord.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLEngineInputRecord.java	2021-09-01 14:33:15.000000000 +0000
@@ -287,8 +287,15 @@
                 }
 
                 handshakeFrag.mark();
-                // skip the first byte: handshake type
+
+                // Fail fast for unknown handshake message.
                 byte handshakeType = handshakeFrag.get();
+                if (!SSLHandshake.isKnown(handshakeType)) {
+                    throw new SSLProtocolException(
+                        "Unknown handshake type size, Handshake.msg_type = " +
+                        (handshakeType & 0xFF));
+                }
+
                 int handshakeBodyLen = Record.getInt24(handshakeFrag);
                 if (handshakeBodyLen > SSLConfiguration.maxHandshakeMessageSize) {
                     throw new SSLProtocolException(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLExtension.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLExtension.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLExtension.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLExtension.java	2021-09-01 14:33:15.000000000 +0000
@@ -387,7 +387,27 @@
                                 null,
                                 PskKeyExchangeModesExtension.chOnTradeAbsence,
                                 PskKeyExchangeModesExtension.pkemStringizer),
-    CERTIFICATE_AUTHORITIES (0x002F, "certificate_authorities"),
+
+    CH_CERTIFICATE_AUTHORITIES (0x002F, "certificate_authorities",
+                                SSLHandshake.CLIENT_HELLO,
+                                ProtocolVersion.PROTOCOLS_OF_13,
+                                CertificateAuthoritiesExtension.chNetworkProducer,
+                                CertificateAuthoritiesExtension.chOnLoadConsumer,
+                                null,
+                                null,
+                                null,
+                                CertificateAuthoritiesExtension.ssStringizer),
+
+    CR_CERTIFICATE_AUTHORITIES (0x002F, "certificate_authorities",
+                                SSLHandshake.CERTIFICATE_REQUEST,
+                                ProtocolVersion.PROTOCOLS_OF_13,
+                                CertificateAuthoritiesExtension.crNetworkProducer,
+                                CertificateAuthoritiesExtension.crOnLoadConsumer,
+                                null,
+                                null,
+                                null,
+                                CertificateAuthoritiesExtension.ssStringizer),
+
     OID_FILTERS             (0x0030, "oid_filters"),
     POST_HANDSHAKE_AUTH     (0x0030, "post_handshake_auth"),
 
@@ -683,6 +703,50 @@
                 extensions.remove(CH_MAX_FRAGMENT_LENGTH);
             }
 
+            // To switch on certificate_authorities extension in ClientHello.
+            //
+            // Note: Please be careful to enable this extension in ClientHello.
+            //
+            // In practice, if the server certificate cannot be validated by
+            // the underlying programs, the user may manually check the
+            // certificate in order to access the service.  The certificate
+            // could be accepted manually, and the handshake continues.  For
+            // example, the browsers provide the manual option to accept
+            // untrusted server certificate. If this extension is enabled in
+            // the ClientHello handshake message, and the server's certificate
+            // does not chain back to any of the CAs in the extension, then the
+            // server will terminate the handshake and close the connection.
+            // There is no chance for the client to perform the manual check.
+            // Therefore, enabling this extension in ClientHello may lead to
+            // unexpected compatibility issues for such cases.
+            //
+            // According to TLS 1.3 specification [RFC 8446] the maximum size
+            // of the certificate_authorities extension is 2^16 bytes.  The
+            // maximum TLS record size is 2^14 bytes.  If the handshake
+            // message is bigger than maximum TLS record size, it should be
+            // splitted into several records.  In fact, some server
+            // implementations do not allow ClientHello messages bigger than
+            // the maximum TLS record size and will immediately abort the
+            // connection with a fatal alert.  Therefore, if the client trusts
+            // too many certificate authorities, there may be unexpected
+            // interoperability issues.
+            //
+            // Furthermore, if the client trusts more CAs such that it exceeds
+            // the size limit of the extension, enabling this extension in
+            // client side does not really make sense any longer as there is
+            // no way to indicate the server certificate selection accurately.
+            //
+            // In general, a server does not use multiple certificates issued
+            // from different CAs.  It is not expected to use this extension a
+            // lot in practice.  When there is a need to use this extension
+            // in ClientHello handshake message, please take care of the
+            // potential compatibility and interoperability issues above.
+            enableExtension = Utilities.getBooleanProperty(
+                    "jdk.tls.client.enableCAExtension", false);
+            if (!enableExtension) {
+                extensions.remove(CH_CERTIFICATE_AUTHORITIES);
+            }
+
             defaults = Collections.unmodifiableCollection(extensions);
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLHandshake.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLHandshake.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLHandshake.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLHandshake.java	2021-09-01 14:33:15.000000000 +0000
@@ -478,6 +478,16 @@
         return "UNKNOWN-HANDSHAKE-MESSAGE(" + id + ")";
     }
 
+    static boolean isKnown(byte id) {
+        for (SSLHandshake hs : SSLHandshake.values()) {
+            if (hs.id == id && id != NOT_APPLICABLE.id) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     static final void kickstart(HandshakeContext context) throws IOException {
         if (context instanceof ClientHandshakeContext) {
             // For initial handshaking, including session resumption,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLLogger.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLLogger.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLLogger.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLLogger.java	2021-09-01 14:33:15.000000000 +0000
@@ -180,7 +180,7 @@
     }
 
     private static void log(Level level, String msg, Object... params) {
-        if (logger.isLoggable(level)) {
+        if (logger != null && logger.isLoggable(level)) {
             if (params == null || params.length == 0) {
                 logger.log(level, msg);
             } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -145,6 +145,15 @@
         return (SSLSessionImpl)getSession(id);
     }
 
+    // package-private method, find and remove session from cache
+    // return found session
+    SSLSessionImpl pull(byte[] id) {
+        if (id != null) {
+            return sessionCache.pull(new SessionId(id));
+        }
+        return null;
+    }
+
     // package-private method, used ONLY by ClientHandshaker
     SSLSessionImpl get(String hostname, int port) {
         /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -540,7 +540,7 @@
     // locks may be deadlocked.
     @Override
     public void close() throws IOException {
-        if (tlsIsClosed) {
+        if (isClosed()) {
             return;
         }
 
@@ -549,19 +549,16 @@
         }
 
         try {
-            // shutdown output bound, which may have been closed previously.
-            if (!isOutputShutdown()) {
-                duplexCloseOutput();
-            }
-
-            // shutdown input bound, which may have been closed previously.
-            if (!isInputShutdown()) {
-                duplexCloseInput();
-            }
+            if (isConnected()) {
+                // shutdown output bound, which may have been closed previously.
+                if (!isOutputShutdown()) {
+                    duplexCloseOutput();
+                }
 
-            if (!isClosed()) {
-                // close the connection directly
-                closeSocket(false);
+                // shutdown input bound, which may have been closed previously.
+                if (!isInputShutdown()) {
+                    duplexCloseInput();
+                }
             }
         } catch (IOException ioe) {
             // ignore the exception
@@ -569,7 +566,19 @@
                 SSLLogger.warning("SSLSocket duplex close failed", ioe);
             }
         } finally {
-            tlsIsClosed = true;
+            if (!isClosed()) {
+                // close the connection directly
+                try {
+                    closeSocket(false);
+                } catch (IOException ioe) {
+                    // ignore the exception
+                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                        SSLLogger.warning("SSLSocket close failed", ioe);
+                    }
+                } finally {
+                    tlsIsClosed = true;
+                }
+            }
         }
     }
 
@@ -1622,6 +1631,18 @@
         }
 
         if (autoClose || !isLayered()) {
+            // Try to clear the kernel buffer to avoid TCP connection resets.
+            if (conContext.inputRecord instanceof
+                    SSLSocketInputRecord && isConnected) {
+                if (appInput.readLock.tryLock()) {
+                    try {
+                        ((SSLSocketInputRecord) (conContext.inputRecord)).deplete(false);
+                    } finally {
+                        appInput.readLock.unlock();
+                    }
+                }
+            }
+
             super.close();
         } else if (selfInitiated) {
             if (!conContext.isInboundClosed() && !isInputShutdown()) {
@@ -1648,17 +1669,23 @@
             SSLLogger.fine("wait for close_notify or alert");
         }
 
-        while (!conContext.isInboundClosed()) {
-            try {
-                Plaintext plainText = decode(null);
-                // discard and continue
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
-                    SSLLogger.finest(
-                        "discard plaintext while waiting for close", plainText);
+        appInput.readLock.lock();
+        try {
+            while (!conContext.isInboundClosed()) {
+                try {
+                    Plaintext plainText = decode(null);
+                    // discard and continue
+                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                        SSLLogger.finest(
+                                "discard plaintext while waiting for close",
+                                plainText);
+                    }
+                } catch (Exception e) {   // including RuntimeException
+                    handleException(e);
                 }
-            } catch (Exception e) {   // including RuntimeException
-                handleException(e);
             }
+        } finally {
+            appInput.readLock.unlock();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketInputRecord.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketInputRecord.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketInputRecord.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/SSLSocketInputRecord.java	2021-09-01 14:33:15.000000000 +0000
@@ -302,8 +302,15 @@
                 }
 
                 handshakeFrag.mark();
-                // skip the first byte: handshake type
+
+                // Fail fast for unknown handshake message.
                 byte handshakeType = handshakeFrag.get();
+                if (!SSLHandshake.isKnown(handshakeType)) {
+                    throw new SSLProtocolException(
+                        "Unknown handshake type size, Handshake.msg_type = " +
+                        (handshakeType & 0xFF));
+                }
+
                 int handshakeBodyLen = Record.getInt24(handshakeFrag);
                 if (handshakeBodyLen > SSLConfiguration.maxHandshakeMessageSize) {
                     throw new SSLProtocolException(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/TransportContext.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/TransportContext.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/TransportContext.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/TransportContext.java	2021-09-01 14:33:15.000000000 +0000
@@ -576,13 +576,7 @@
             } else if (!isOutboundClosed()) {
                 // Special case that the inbound was closed, but outbound open.
                 return HandshakeStatus.NEED_WRAP;
-            }
-        } else if (isOutboundClosed() && !isInboundClosed()) {
-            // Special case that the outbound was closed, but inbound open.
-            return HandshakeStatus.NEED_UNWRAP;
-        } else if (!isOutboundClosed() && isInboundClosed()) {
-            // Special case that the inbound was closed, but outbound open.
-            return HandshakeStatus.NEED_WRAP;
+            }   // Otherwise, both inbound and outbound are closed.
         }
 
         return HandshakeStatus.NOT_HANDSHAKING;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/Utilities.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/Utilities.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/Utilities.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/Utilities.java	2021-09-01 14:33:15.000000000 +0000
@@ -250,23 +250,4 @@
         }
     }
 
-    /**
-     * Returns true if the two specified arrays of bytes, over the specified
-     * ranges, are <i>equal</i> to one another.
-     */
-    static boolean equals(byte[] arr1, int st1, int end1, byte[] arr2, int st2, int end2) {
-        rangeCheck(arr1.length, st1, end1);
-        rangeCheck(arr2.length, st2, end2);
-
-        int aLength = end1 - st1;
-        int bLength = end2 - st2;
-        if (aLength != bLength)
-            return false;
-
-        for(int i=0; i<aLength; i++)
-            if(arr1[i + st1] != arr2[i + st2])
-                return false;
-        return true;
-    }
-
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/X509Authentication.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/X509Authentication.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/ssl/X509Authentication.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/ssl/X509Authentication.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -160,9 +160,9 @@
         }
     }
 
-    private static final
-            class X509PossessionGenerator implements SSLPossessionGenerator {
-        private final String[] keyTypes;
+    static final class X509PossessionGenerator
+                implements SSLPossessionGenerator {
+        final String[] keyTypes;
 
         private X509PossessionGenerator(String[] keyTypes) {
             this.keyTypes = keyTypes;
@@ -199,12 +199,14 @@
             if (chc.conContext.transport instanceof SSLSocketImpl) {
                 clientAlias = km.chooseClientAlias(
                         new String[] { keyType },
-                        chc.peerSupportedAuthorities,
+                        chc.peerSupportedAuthorities == null ? null :
+                                chc.peerSupportedAuthorities.clone(),
                         (SSLSocket)chc.conContext.transport);
             } else if (chc.conContext.transport instanceof SSLEngineImpl) {
                 clientAlias = km.chooseEngineClientAlias(
                         new String[] { keyType },
-                        chc.peerSupportedAuthorities,
+                        chc.peerSupportedAuthorities == null ? null :
+                                chc.peerSupportedAuthorities.clone(),
                         (SSLEngine)chc.conContext.transport);
             }
 
@@ -253,10 +255,14 @@
             String serverAlias = null;
             if (shc.conContext.transport instanceof SSLSocketImpl) {
                 serverAlias = km.chooseServerAlias(keyType,
-                        null, (SSLSocket)shc.conContext.transport);
+                        shc.peerSupportedAuthorities == null ? null :
+                                shc.peerSupportedAuthorities.clone(),
+                        (SSLSocket)shc.conContext.transport);
             } else if (shc.conContext.transport instanceof SSLEngineImpl) {
                 serverAlias = km.chooseEngineServerAlias(keyType,
-                        null, (SSLEngine)shc.conContext.transport);
+                        shc.peerSupportedAuthorities == null ? null :
+                                shc.peerSupportedAuthorities.clone(),
+                        (SSLEngine)shc.conContext.transport);
             }
 
             if (serverAlias == null) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Main.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Main.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Main.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Main.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -521,7 +521,8 @@
     }
 
     static char[] getPass(String modifier, String arg) {
-        char[] output = KeyStoreUtil.getPassWithModifier(modifier, arg, rb);
+        char[] output =
+            KeyStoreUtil.getPassWithModifier(modifier, arg, rb, collator);
         if (output != null) return output;
         usage();
         return null;    // Useless, usage() already exit
@@ -709,8 +710,12 @@
                     CodeSigner[] signers = je.getCodeSigners();
                     boolean isSigned = (signers != null);
                     anySigned |= isSigned;
-                    hasUnsignedEntry |= !je.isDirectory() && !isSigned
-                                        && !signatureRelated(name);
+
+                    boolean unsignedEntry = !isSigned
+                            && ((!je.isDirectory() && !signatureRelated(name))
+                            // a directory entry but with a suspicious size
+                            || (je.isDirectory() && je.getSize() > 0));
+                    hasUnsignedEntry |= unsignedEntry;
 
                     int inStoreOrScope = inKeyStore(signers);
 
@@ -735,7 +740,9 @@
                           (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
                           (inStore ? rb.getString("k") : rb.getString("SPACE")) +
                           (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
+                          ((inStoreOrScope & NOT_ALIAS) != 0 ?
+                          rb.getString("X") : rb.getString("SPACE")) +
+                          (unsignedEntry ? rb.getString("q") : rb.getString("SPACE")) +
                           rb.getString("SPACE"));
                         sb.append("|");
                     }
@@ -760,9 +767,13 @@
                         if (signatureRelated(name)) {
                             sb.append("\n" + tab + rb.getString(
                                     ".Signature.related.entries.") + "\n\n");
+                        } else if (unsignedEntry) {
+                            sb.append('\n').append(tab)
+                                    .append(rb.getString(".Unsigned.entries."))
+                                    .append("\n\n");
                         } else {
                             sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                                    ".Directory.entries.") + "\n\n");
                         }
                     }
 
@@ -839,6 +850,11 @@
                     System.out.println(rb.getString(
                         ".X.not.signed.by.specified.alias.es."));
                 }
+
+                if (hasUnsignedEntry) {
+                    System.out.println(rb.getString(
+                            ".q.unsigned.entry"));
+                }
             }
             if (man == null) {
                 System.out.println();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Resources.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Resources.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Resources.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/jarsigner/Resources.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -121,6 +121,8 @@
         {"m", "m"},
         {"k", "k"},
         {"i", "i"},
+        {"X", "X"},
+        {"q", "?"},
         {".and.d.more.", "(and %d more)"},
         {".s.signature.was.verified.",
                 "  s = signature was verified "},
@@ -132,9 +134,12 @@
                 "  i = at least one certificate was found in identity scope"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X = not signed by specified alias(es)"},
+        {".q.unsigned.entry",
+                "  ? = unsigned entry"},
         {"no.manifest.", "no manifest."},
         {".Signature.related.entries.","(Signature related entries)"},
         {".Unsigned.entries.", "(Unsigned entries)"},
+        {".Directory.entries.", "(Directory entries)"},
         {"jar.is.unsigned",
                 "jar is unsigned."},
         {"jar.treated.unsigned",
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/KeyStoreUtil.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/KeyStoreUtil.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/KeyStoreUtil.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, 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
@@ -39,6 +39,7 @@
 import java.text.Collator;
 
 import java.util.Locale;
+import java.util.ResourceBundle;
 
 /**
  * <p> This class provides several utilities to <code>KeyStore</code>.
@@ -53,12 +54,6 @@
 
     private static final String JKS = "jks";
 
-    private static final Collator collator = Collator.getInstance();
-    static {
-        // this is for case insensitive string comparisons
-        collator.setStrength(Collator.PRIMARY);
-    };
-
     /**
      * Returns true if the certificate is self-signed, false otherwise.
      */
@@ -123,7 +118,8 @@
     }
 
     public static char[] getPassWithModifier(String modifier, String arg,
-                                             java.util.ResourceBundle rb) {
+                                             ResourceBundle rb,
+                                             Collator collator) {
         if (modifier == null) {
             return arg.toCharArray();
         } else if (collator.compare(modifier, "env") == 0) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java	2021-09-01 14:33:15.000000000 +0000
@@ -31,7 +31,10 @@
 import java.security.cert.CertificateEncodingException;
 import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
 
 import sun.security.pkcs10.PKCS10;
 import sun.security.x509.*;
@@ -245,6 +248,12 @@
         try {
             lastDate = new Date ();
             lastDate.setTime (firstDate.getTime () + validity * 1000);
+            Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+            c.setTime(lastDate);
+            if (c.get(Calendar.YEAR) > 9999) {
+                throw new CertificateException("Validity period ends at calendar year " +
+                        c.get(Calendar.YEAR) + " which is greater than 9999");
+            }
 
             CertificateValidity interval =
                                    new CertificateValidity(firstDate,lastDate);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Main.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Main.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Main.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Main.java	2021-09-01 14:33:15.000000000 +0000
@@ -1291,8 +1291,7 @@
                                            X509CertInfo.DN_NAME);
 
         Date firstDate = getStartDate(startDate);
-        Date lastDate = new Date();
-        lastDate.setTime(firstDate.getTime() + validity*1000L*24L*60L*60L);
+        Date lastDate = getLastDate(firstDate, validity);
         CertificateValidity interval = new CertificateValidity(firstDate,
                                                                lastDate);
 
@@ -1388,12 +1387,10 @@
                                                       X509CertInfo.DN_NAME);
 
         Date firstDate = getStartDate(startDate);
-        Date lastDate = (Date) firstDate.clone();
-        lastDate.setTime(lastDate.getTime() + validity*1000*24*60*60);
+        Date lastDate = getLastDate(firstDate, validity);
         CertificateValidity interval = new CertificateValidity(firstDate,
                                                                lastDate);
 
-
         PrivateKey privateKey =
                 (PrivateKey)recoverKey(alias, storePass, keyPass).fst;
         if (sigAlgName == null) {
@@ -2728,8 +2725,7 @@
 
         // Extend its validity
         Date firstDate = getStartDate(startDate);
-        Date lastDate = new Date();
-        lastDate.setTime(firstDate.getTime() + validity*1000L*24L*60L*60L);
+        Date lastDate = getLastDate(firstDate, validity);
         CertificateValidity interval = new CertificateValidity(firstDate,
                                                                lastDate);
         certInfo.set(X509CertInfo.VALIDITY, interval);
@@ -4370,6 +4366,21 @@
         return ext;
     }
 
+    private Date getLastDate(Date firstDate, long validity)
+            throws Exception {
+        Date lastDate = new Date();
+        lastDate.setTime(firstDate.getTime() + validity*1000L*24L*60L*60L);
+
+        Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        c.setTime(lastDate);
+        if (c.get(Calendar.YEAR) > 9999) {
+            throw new Exception("Validity period ends at calendar year " +
+                    c.get(Calendar.YEAR) + " which is greater than 9999");
+        }
+
+        return lastDate;
+    }
+
     private boolean isTrustedCert(Certificate cert) throws KeyStoreException {
         if (caks != null && caks.getCertificateAlias(cert) != null) {
             return true;
@@ -4526,7 +4537,8 @@
     }
 
     private char[] getPass(String modifier, String arg) {
-        char[] output = KeyStoreUtil.getPassWithModifier(modifier, arg, rb);
+        char[] output =
+            KeyStoreUtil.getPassWithModifier(modifier, arg, rb, collator);
         if (output != null) return output;
         tinyHelp();
         return null;    // Useless, tinyHelp() already exits.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Resources.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Resources.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Resources.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/tools/keytool/Resources.java	2021-09-01 14:33:15.000000000 +0000
@@ -449,7 +449,7 @@
         {"key.bit.disabled", "%1$d-bit %2$s key (disabled)"},
         {"unknown.size.1", "unknown size %s key"},
         {".PATTERN.printX509Cert.with.weak",
-                "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8} ({9,number,#})\nVersion: {10}"},
+                "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8}\nVersion: {9}"},
         {"PKCS.10.with.weak",
                 "PKCS #10 Certificate Request (Version 1.0)\n" +
                         "Subject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignature algorithm: %4$s\n"},
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/ByteArrays.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/ByteArrays.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/ByteArrays.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/ByteArrays.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.util;
+
+/**
+ * A time-instance comparison of two byte arrays.
+ */
+public class ByteArrays {
+    // See the MessageDigest.isEqual(byte[] digesta, byte[] digestb)
+    // implementation.  This is a potential enhancement of the
+    // MessageDigest class.
+    public static boolean isEqual(byte[] a, int aFromIndex, int aToIndex,
+                                 byte[] b, int bFromIndex, int bToIndex) {
+        if (a == b) {
+            return true;
+        }
+
+        if (a == null || b == null) {
+            return false;
+        }
+
+        if (a.length == 0) {
+            return b.length == 0;
+        }
+
+        int lenA = aToIndex - aFromIndex;
+        int lenB = bToIndex - bFromIndex;
+
+        if (lenB == 0) {
+            return lenA == 0;
+        }
+
+        int result = 0;
+        result |= lenA - lenB;
+
+        // time-constant comparison
+        for (int indexA = 0; indexA < lenA; indexA++) {
+            int indexB = ((indexA - lenB) >>> 31) * indexA;
+            result |= a[aFromIndex + indexA] ^ b[bFromIndex + indexB];
+        }
+
+        return result == 0;
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/Cache.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/Cache.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/Cache.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/Cache.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, 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
@@ -101,6 +101,11 @@
     public abstract void remove(Object key);
 
     /**
+     * Pull an entry from the cache.
+     */
+    public abstract V pull(Object key);
+
+    /**
      * Set the maximum size.
      */
     public abstract void setCapacity(int size);
@@ -228,6 +233,10 @@
         // empty
     }
 
+    public V pull(Object key) {
+        return null;
+    }
+
     public void setCapacity(int size) {
         // empty
     }
@@ -252,6 +261,7 @@
     private final Map<K, CacheEntry<K,V>> cacheMap;
     private int maxSize;
     private long lifetime;
+    private long nextExpirationTime = Long.MAX_VALUE;
 
     // ReferenceQueue is of type V instead of Cache<K,V>
     // to allow SoftCacheEntry to extend SoftReference<V>
@@ -321,12 +331,18 @@
         }
         int cnt = 0;
         long time = System.currentTimeMillis();
+        if (nextExpirationTime > time) {
+            return;
+        }
+        nextExpirationTime = Long.MAX_VALUE;
         for (Iterator<CacheEntry<K,V>> t = cacheMap.values().iterator();
                 t.hasNext(); ) {
             CacheEntry<K,V> entry = t.next();
             if (entry.isValid(time) == false) {
                 t.remove();
                 cnt++;
+            } else if (nextExpirationTime > entry.getExpirationTime()) {
+                nextExpirationTime = entry.getExpirationTime();
             }
         }
         if (DEBUG) {
@@ -360,6 +376,9 @@
         emptyQueue();
         long expirationTime = (lifetime == 0) ? 0 :
                                         System.currentTimeMillis() + lifetime;
+        if (expirationTime < nextExpirationTime) {
+            nextExpirationTime = expirationTime;
+        }
         CacheEntry<K,V> newEntry = newEntry(key, value, expirationTime, queue);
         CacheEntry<K,V> oldEntry = cacheMap.put(key, newEntry);
         if (oldEntry != null) {
@@ -406,6 +425,26 @@
         }
     }
 
+    public synchronized V pull(Object key) {
+        emptyQueue();
+        CacheEntry<K,V> entry = cacheMap.remove(key);
+        if (entry == null) {
+            return null;
+        }
+
+        long time = (lifetime == 0) ? 0 : System.currentTimeMillis();
+        if (entry.isValid(time)) {
+            V value = entry.getValue();
+            entry.invalidate();
+            return value;
+        } else {
+            if (DEBUG) {
+                System.out.println("Ignoring expired entry");
+            }
+            return null;
+        }
+    }
+
     public synchronized void setCapacity(int size) {
         expungeExpiredEntries();
         if (size > 0 && cacheMap.size() > size) {
@@ -474,6 +513,7 @@
 
         V getValue();
 
+        long getExpirationTime();
     }
 
     private static class HardCacheEntry<K,V> implements CacheEntry<K,V> {
@@ -496,6 +536,10 @@
             return value;
         }
 
+        public long getExpirationTime() {
+            return expirationTime;
+        }
+
         public boolean isValid(long currentTime) {
             boolean valid = (currentTime <= expirationTime);
             if (valid == false) {
@@ -533,6 +577,10 @@
             return get();
         }
 
+        public long getExpirationTime() {
+            return expirationTime;
+        }
+
         public boolean isValid(long currentTime) {
             boolean valid = (currentTime <= expirationTime) && (get() != null);
             if (valid == false) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerIndefLenConverter.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerIndefLenConverter.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerIndefLenConverter.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerIndefLenConverter.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -26,12 +26,19 @@
 package sun.security.util;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
+
+import sun.misc.IOUtils;
 
 /**
- * A package private utility class to convert indefinite length DER
+ * A package private utility class to convert indefinite length BER
  * encoded byte arrays to definite length DER encoded byte arrays.
- *
+ * <p>
+ * Note: This class only substitute indefinite length octets to definite
+ * length octets. It does not update the contents even if they are not DER.
+ * <p>
  * This assumes that the basic data structure is "tag, length, value"
  * triplet. In the case where the length is "indefinite", terminating
  * end-of-contents bytes are expected.
@@ -40,26 +47,30 @@
  */
 class DerIndefLenConverter {
 
-    private static final int TAG_MASK            = 0x1f; // bits 5-1
-    private static final int FORM_MASK           = 0x20; // bits 6
-    private static final int CLASS_MASK          = 0xC0; // bits 8 and 7
-
     private static final int LEN_LONG            = 0x80; // bit 8 set
     private static final int LEN_MASK            = 0x7f; // bits 7 - 1
-    private static final int SKIP_EOC_BYTES      = 2;
 
     private byte[] data, newData;
     private int newDataPos, dataPos, dataSize, index;
     private int unresolved = 0;
 
+    // A list to store each indefinite length occurrence. Whenever an indef
+    // length is seen, the position after the 0x80 byte is appended to the
+    // list as an integer. Whenever its matching EOC is seen, we know the
+    // actual length and the position value is substituted with a calculated
+    // length octets. At the end, the new DER encoding is a concatenation of
+    // all existing tags, existing definite length octets, existing contents,
+    // and the newly created definte length octets in this list.
     private ArrayList<Object> ndefsList = new ArrayList<Object>();
 
+    // Length of extra bytes needed to convert indefinite encoding to definite.
+    // For each resolved indefinite length encoding, the starting 0x80 byte
+    // and the ending 00 00 bytes will be removed and a new definite length
+    // octets will be added. This value might be positive or negative.
     private int numOfTotalLenBytes = 0;
 
-    private boolean isEOC(int tag) {
-        return (((tag & TAG_MASK) == 0x00) &&  // EOC
-                ((tag & FORM_MASK) == 0x00) && // primitive
-                ((tag & CLASS_MASK) == 0x00)); // universal
+    private static boolean isEOC(byte[] data, int pos) {
+        return data[pos] == 0 && data[pos + 1] == 0;
     }
 
     // if bit 8 is set then it implies either indefinite length or long form
@@ -86,47 +97,48 @@
     }
 
     /**
-     * Parse the tag and if it is an end-of-contents tag then
-     * add the current position to the <code>eocList</code> vector.
+     * Consumes the tag at {@code dataPos}.
+     * <p>
+     * If it is EOC then replace the matching start position (i.e. the previous
+     * {@code dataPos} where an indefinite length was found by #parseLength)
+     * in {@code ndefsList} with a length octets for this section.
      */
     private void parseTag() throws IOException {
-        if (dataPos == dataSize)
-            return;
-        try {
-            if (isEOC(data[dataPos]) && (data[dataPos + 1] == 0)) {
-                int numOfEncapsulatedLenBytes = 0;
-                Object elem = null;
-                int index;
-                for (index = ndefsList.size()-1; index >= 0; index--) {
-                    // Determine the first element in the vector that does not
-                    // have a matching EOC
-                    elem = ndefsList.get(index);
-                    if (elem instanceof Integer) {
-                        break;
-                    } else {
-                        numOfEncapsulatedLenBytes += ((byte[])elem).length - 3;
-                    }
+        if (isEOC(data, dataPos)) {
+            int numOfEncapsulatedLenBytes = 0;
+            Object elem = null;
+            int index;
+            for (index = ndefsList.size()-1; index >= 0; index--) {
+                // Determine the first element in the vector that does not
+                // have a matching EOC
+                elem = ndefsList.get(index);
+                if (elem instanceof Integer) {
+                    break;
+                } else {
+                    // For each existing converted part, 3 bytes (80 at the
+                    // beginning and 00 00 at the end) are removed and a
+                    // new length octets is added.
+                    numOfEncapsulatedLenBytes += ((byte[])elem).length - 3;
                 }
-                if (index < 0) {
-                    throw new IOException("EOC does not have matching " +
-                                          "indefinite-length tag");
-                }
-                int sectionLen = dataPos - ((Integer)elem).intValue() +
-                                 numOfEncapsulatedLenBytes;
-                byte[] sectionLenBytes = getLengthBytes(sectionLen);
-                ndefsList.set(index, sectionLenBytes);
-                unresolved--;
-
-                // Add the number of bytes required to represent this section
-                // to the total number of length bytes,
-                // and subtract the indefinite-length tag (1 byte) and
-                // EOC bytes (2 bytes) for this section
-                numOfTotalLenBytes += (sectionLenBytes.length - 3);
-            }
-            dataPos++;
-        } catch (IndexOutOfBoundsException iobe) {
-            throw new IOException(iobe);
+            }
+            if (index < 0) {
+                throw new IOException("EOC does not have matching " +
+                                      "indefinite-length tag");
+            }
+            int sectionLen = dataPos - ((Integer)elem).intValue() +
+                             numOfEncapsulatedLenBytes;
+            byte[] sectionLenBytes = getLengthBytes(sectionLen);
+            ndefsList.set(index, sectionLenBytes);
+            assert unresolved > 0;
+            unresolved--;
+
+            // Add the number of bytes required to represent this section
+            // to the total number of length bytes,
+            // and subtract the indefinite-length tag (1 byte) and
+            // EOC bytes (2 bytes) for this section
+            numOfTotalLenBytes += (sectionLenBytes.length - 3);
         }
+        dataPos++;
     }
 
     /**
@@ -134,37 +146,48 @@
      * then skip the tag and its 1 byte length of zero.
      */
     private void writeTag() {
-        if (dataPos == dataSize)
+        if (dataPos == dataSize) {
             return;
-        int tag = data[dataPos++];
-        if (isEOC(tag) && (data[dataPos] == 0)) {
-            dataPos++;  // skip length
+        }
+        assert dataPos + 1 < dataSize;
+        if (isEOC(data, dataPos)) {
+            dataPos += 2;  // skip tag and length
             writeTag();
-        } else
-            newData[newDataPos++] = (byte)tag;
+        } else {
+            newData[newDataPos++] = data[dataPos++];
+        }
     }
 
     /**
-     * Parse the length and if it is an indefinite length then add
-     * the current position to the <code>ndefsList</code> vector.
+     * Parse the length octets started at {@code dataPos}. After this method
+     * is called, {@code dataPos} is placed after the length octets except
+     * -1 is returned.
+     *
+     * @return a) the length of definite length data next
+     *         b) -1, if it is a definite length data next but the length
+     *            octets is not complete to determine the actual length
+     *         c) 0, if it is an indefinite length. Also, append the current
+     *            position to the {@code ndefsList} vector.
+     * @throws IOException if invalid data is read
      */
     private int parseLength() throws IOException {
-        int curLen = 0;
-        if (dataPos == dataSize)
-            return curLen;
+        if (dataPos == dataSize) {
+            return 0;
+        }
         int lenByte = data[dataPos++] & 0xff;
         if (isIndefinite(lenByte)) {
             ndefsList.add(new Integer(dataPos));
             unresolved++;
-            return curLen;
+            return 0;
         }
+        int curLen = 0;
         if (isLongForm(lenByte)) {
             lenByte &= LEN_MASK;
             if (lenByte > 4) {
                 throw new IOException("Too much data");
             }
             if ((dataSize - dataPos) < (lenByte + 1)) {
-                throw new IOException("Too little data");
+                return -1;
             }
             for (int i = 0; i < lenByte; i++) {
                 curLen = (curLen << 8) + (data[dataPos++] & 0xff);
@@ -179,14 +202,17 @@
     }
 
     /**
-     * Write the length and if it is an indefinite length
-     * then calculate the definite length from the positions
-     * of the indefinite length and its matching EOC terminator.
-     * Then, write the value.
+     * Write the length and value.
+     * <p>
+     * If it was definite length, just re-write the length and copy the value.
+     * If it was an indefinite length, copy the precalculated definite octets
+     * from {@code ndefsList}. There is no values here because they will be
+     * sub-encodings of a constructed encoding.
      */
     private void writeLengthAndValue() throws IOException {
-        if (dataPos == dataSize)
-           return;
+        if (dataPos == dataSize) {
+            return;
+        }
         int curLen = 0;
         int lenByte = data[dataPos++] & 0xff;
         if (isIndefinite(lenByte)) {
@@ -194,21 +220,21 @@
             System.arraycopy(lenBytes, 0, newData, newDataPos,
                              lenBytes.length);
             newDataPos += lenBytes.length;
-            return;
-        }
-        if (isLongForm(lenByte)) {
-            lenByte &= LEN_MASK;
-            for (int i = 0; i < lenByte; i++) {
-                curLen = (curLen << 8) + (data[dataPos++] & 0xff);
-            }
-            if (curLen < 0) {
-                throw new IOException("Invalid length bytes");
-            }
         } else {
-            curLen = (lenByte & LEN_MASK);
+            if (isLongForm(lenByte)) {
+                lenByte &= LEN_MASK;
+                for (int i = 0; i < lenByte; i++) {
+                    curLen = (curLen << 8) + (data[dataPos++] & 0xff);
+                }
+                if (curLen < 0) {
+                    throw new IOException("Invalid length bytes");
+                }
+            } else {
+                curLen = (lenByte & LEN_MASK);
+            }
+            writeLength(curLen);
+            writeValue(curLen);
         }
-        writeLength(curLen);
-        writeValue(curLen);
     }
 
     private void writeLength(int curLen) {
@@ -297,18 +323,12 @@
     }
 
     /**
-     * Parse the value;
-     */
-    private void parseValue(int curLen) {
-        dataPos += curLen;
-    }
-
-    /**
      * Write the value;
      */
     private void writeValue(int curLen) {
-        for (int i=0; i < curLen; i++)
-            newData[newDataPos++] = data[dataPos++];
+        System.arraycopy(data, dataPos, newData, newDataPos, curLen);
+        dataPos += curLen;
+        newDataPos += curLen;
     }
 
     /**
@@ -318,44 +338,100 @@
      * @param indefData the byte array holding the indefinite
      *        length encoding.
      * @return the byte array containing the definite length
-     *         DER encoding.
+     *         DER encoding, or null if there is not enough data.
      * @exception IOException on parsing or re-writing errors.
      */
-    byte[] convert(byte[] indefData) throws IOException {
+    byte[] convertBytes(byte[] indefData) throws IOException {
         data = indefData;
-        dataPos=0; index=0;
+        dataPos = 0;
         dataSize = data.length;
-        int len=0;
-        int unused = 0;
 
         // parse and set up the vectors of all the indefinite-lengths
         while (dataPos < dataSize) {
+            if (dataPos + 2 > dataSize) {
+                // There should be at least one tag and one length
+                return null;
+            }
             parseTag();
-            len = parseLength();
-            parseValue(len);
+            int len = parseLength();
+            if (len < 0) {
+                return null;
+            }
+            dataPos += len;
+            if (dataPos < 0) {
+                // overflow
+                throw new IOException("Data overflow");
+            }
             if (unresolved == 0) {
-                unused = dataSize - dataPos;
-                dataSize = dataPos;
+                assert !ndefsList.isEmpty() && ndefsList.get(0) instanceof byte[];
                 break;
             }
         }
 
         if (unresolved != 0) {
-            throw new IOException("not all indef len BER resolved");
+            return null;
         }
 
+        int unused = dataSize - dataPos;
+        assert unused >= 0;
+        dataSize = dataPos;
+
         newData = new byte[dataSize + numOfTotalLenBytes + unused];
-        dataPos=0; newDataPos=0; index=0;
+        dataPos = 0; newDataPos = 0; index = 0;
 
         // write out the new byte array replacing all the indefinite-lengths
         // and EOCs
         while (dataPos < dataSize) {
-           writeTag();
-           writeLengthAndValue();
+            writeTag();
+            writeLengthAndValue();
         }
         System.arraycopy(indefData, dataSize,
                          newData, dataSize + numOfTotalLenBytes, unused);
 
         return newData;
     }
+
+    /**
+     * Read the input stream into a DER byte array. If an indef len BER is
+     * not resolved this method will try to read more data until EOF is reached.
+     * This may block.
+     *
+     * @param in the input stream with tag and lenByte already read
+     * @param lenByte the length of the length field to remember
+     * @param tag the tag to remember
+     * @return a DER byte array
+     * @throws IOException if not all indef len BER
+     *         can be resolved or another I/O error happens
+     */
+    public static byte[] convertStream(InputStream in, byte lenByte, byte tag)
+            throws IOException {
+        int offset = 2;     // for tag and length bytes
+        int readLen = in.available();
+        byte[] indefData = new byte[readLen + offset];
+        indefData[0] = tag;
+        indefData[1] = lenByte;
+        while (true) {
+            int bytesRead = IOUtils.readNBytes(in, indefData, offset, readLen);
+            if (bytesRead != readLen) {
+                readLen = bytesRead;
+                indefData = Arrays.copyOf(indefData, offset + bytesRead);
+            }
+            DerIndefLenConverter derIn = new DerIndefLenConverter();
+            byte[] result = derIn.convertBytes(indefData);
+            if (result == null) {
+                int next = in.read(); // This could block, but we need more
+                if (next == -1) {
+                    throw new IOException("not enough data to resolve indef len BER");
+                }
+                int more = in.available();
+                // expand array to include next and more
+                indefData = Arrays.copyOf(indefData, offset + readLen + 1 + more);
+                indefData[offset + readLen] = (byte)next;
+                offset = offset + readLen + 1;
+                readLen = more;
+            } else {
+                return result;
+            }
+        }
+    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerInputStream.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerInputStream.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerInputStream.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerInputStream.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -27,11 +27,9 @@
 
 import java.io.InputStream;
 import java.io.IOException;
-import java.io.EOFException;
 import java.util.Date;
 import java.util.Vector;
 import java.math.BigInteger;
-import java.io.DataInputStream;
 
 /**
  * A DER input stream, used for parsing ASN.1 DER-encoded data such as
@@ -130,7 +128,12 @@
                 System.arraycopy(data, offset, inData, 0, len);
 
                 DerIndefLenConverter derIn = new DerIndefLenConverter();
-                buffer = new DerInputBuffer(derIn.convert(inData), allowBER);
+                byte[] result = derIn.convertBytes(inData);
+                if (result == null) {
+                    throw new IOException("not all indef len BER resolved");
+                } else {
+                    buffer = new DerInputBuffer(result, allowBER);
+                }
             }
         } else {
             buffer = new DerInputBuffer(data, offset, len, allowBER);
@@ -389,16 +392,9 @@
 
         if (len == -1) {
            // indefinite length encoding found
-           int readLen = buffer.available();
-           int offset = 2;     // for tag and length bytes
-           byte[] indefData = new byte[readLen + offset];
-           indefData[0] = tag;
-           indefData[1] = lenByte;
-           DataInputStream dis = new DataInputStream(buffer);
-           dis.readFully(indefData, offset, readLen);
-           dis.close();
-           DerIndefLenConverter derIn = new DerIndefLenConverter();
-           buffer = new DerInputBuffer(derIn.convert(indefData), buffer.allowBER);
+           buffer = new DerInputBuffer(
+                   DerIndefLenConverter.convertStream(buffer, lenByte, tag),
+                   buffer.allowBER);
 
            if (tag != buffer.read())
                 throw new IOException("Indefinite length encoding" +
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerValue.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerValue.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/DerValue.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/DerValue.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -258,16 +258,9 @@
         length = DerInputStream.getLength(lenByte, in);
         if (length == -1) {  // indefinite length encoding found
             DerInputBuffer inbuf = in.dup();
-            int readLen = inbuf.available();
-            int offset = 2;     // for tag and length bytes
-            byte[] indefData = new byte[readLen + offset];
-            indefData[0] = tag;
-            indefData[1] = lenByte;
-            DataInputStream dis = new DataInputStream(inbuf);
-            dis.readFully(indefData, offset, readLen);
-            dis.close();
-            DerIndefLenConverter derIn = new DerIndefLenConverter();
-            inbuf = new DerInputBuffer(derIn.convert(indefData), in.allowBER);
+            inbuf = new DerInputBuffer(
+                    DerIndefLenConverter.convertStream(inbuf, lenByte, tag),
+                    in.allowBER);
             if (tag != inbuf.read())
                 throw new IOException
                         ("Indefinite length encoding not supported");
@@ -278,7 +271,7 @@
             // indefinite form is encoded by sending a length field with a
             // length of 0. - i.e. [1000|0000].
             // the object is ended by sending two zero bytes.
-            in.skip(length + offset);
+            in.skip(length + 2);
         } else {
 
             buffer = in.dup();
@@ -390,16 +383,8 @@
         byte lenByte = (byte)in.read();
         length = DerInputStream.getLength(lenByte, in);
         if (length == -1) { // indefinite length encoding found
-            int readLen = in.available();
-            int offset = 2;     // for tag and length bytes
-            byte[] indefData = new byte[readLen + offset];
-            indefData[0] = tag;
-            indefData[1] = lenByte;
-            DataInputStream dis = new DataInputStream(in);
-            dis.readFully(indefData, offset, readLen);
-            dis.close();
-            DerIndefLenConverter derIn = new DerIndefLenConverter();
-            in = new ByteArrayInputStream(derIn.convert(indefData));
+            in = new ByteArrayInputStream(
+                    DerIndefLenConverter.convertStream(in, lenByte, tag));
             if (tag != in.read())
                 throw new IOException
                         ("Indefinite length encoding not supported");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/SignatureFileVerifier.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/SignatureFileVerifier.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/util/SignatureFileVerifier.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/util/SignatureFileVerifier.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -247,7 +247,7 @@
      *
      */
     public void process(Hashtable<String, CodeSigner[]> signers,
-            List<Object> manifestDigests)
+            List<Object> manifestDigests, String manifestName)
         throws IOException, SignatureException, NoSuchAlgorithmException,
             JarException, CertificateException
     {
@@ -256,7 +256,7 @@
         Object obj = null;
         try {
             obj = Providers.startJarVerification();
-            processImpl(signers, manifestDigests);
+            processImpl(signers, manifestDigests, manifestName);
         } finally {
             Providers.stopJarVerification(obj);
         }
@@ -264,7 +264,7 @@
     }
 
     private void processImpl(Hashtable<String, CodeSigner[]> signers,
-            List<Object> manifestDigests)
+            List<Object> manifestDigests, String manifestName)
         throws IOException, SignatureException, NoSuchAlgorithmException,
             JarException, CertificateException
     {
@@ -345,7 +345,7 @@
         }
 
         // MANIFEST.MF is always regarded as signed
-        updateSigners(newSigners, signers, JarFile.MANIFEST_NAME);
+        updateSigners(newSigners, signers, manifestName);
     }
 
     /**
@@ -521,6 +521,10 @@
                 if (digest != null) {
                     ManifestDigester.Entry mde =
                         md.get(ManifestDigester.MF_MAIN_ATTRS, false);
+                    if (mde == null) {
+                        throw new SignatureException("Manifest Main Attribute check " +
+                                "failed due to missing main attributes entry");
+                    }
                     byte[] computedHash = mde.digest(digest);
                     byte[] expectedHash =
                         Base64.getMimeDecoder().decode((String)se.getValue());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/x509/AlgorithmId.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/x509/AlgorithmId.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/security/x509/AlgorithmId.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/security/x509/AlgorithmId.java	2021-09-01 14:33:15.000000000 +0000
@@ -589,6 +589,15 @@
             || name.equalsIgnoreCase("SHA1/RSA")) {
             return AlgorithmId.sha1WithRSAEncryption_oid;
         }
+        if (name.equalsIgnoreCase("SHA256WithRSA")) {
+            return AlgorithmId.sha256WithRSAEncryption_oid;
+        }
+        if (name.equalsIgnoreCase("SHA384WithRSA")) {
+            return AlgorithmId.sha384WithRSAEncryption_oid;
+        }
+        if (name.equalsIgnoreCase("SHA512WithRSA")) {
+            return AlgorithmId.sha512WithRSAEncryption_oid;
+        }
         if (name.equalsIgnoreCase("SHA1withECDSA")
                 || name.equalsIgnoreCase("ECDSA")) {
             return AlgorithmId.sha1WithECDSA_oid;
@@ -606,58 +615,61 @@
             return AlgorithmId.sha512WithECDSA_oid;
         }
 
-        // See if any of the installed providers supply a mapping from
-        // the given algorithm name to an OID string
-        String oidString;
-        if (!initOidTable) {
-            Provider[] provs = Security.getProviders();
-            for (int i=0; i<provs.length; i++) {
-                for (Enumeration<Object> enum_ = provs[i].keys();
-                     enum_.hasMoreElements(); ) {
-                    String alias = (String)enum_.nextElement();
-                    String upperCaseAlias = alias.toUpperCase(Locale.ENGLISH);
-                    int index;
-                    if (upperCaseAlias.startsWith("ALG.ALIAS") &&
-                            (index=upperCaseAlias.indexOf("OID.", 0)) != -1) {
-                        index += "OID.".length();
-                        if (index == alias.length()) {
-                            // invalid alias entry
-                            break;
-                        }
-                        if (oidTable == null) {
-                            oidTable = new HashMap<String,ObjectIdentifier>();
-                        }
-                        oidString = alias.substring(index);
-                        String stdAlgName = provs[i].getProperty(alias);
-                        if (stdAlgName != null) {
-                            stdAlgName = stdAlgName.toUpperCase(Locale.ENGLISH);
-                        }
-                        if (stdAlgName != null &&
-                                oidTable.get(stdAlgName) == null) {
-                            oidTable.put(stdAlgName,
-                                         new ObjectIdentifier(oidString));
-                        }
-                    }
-                }
-            }
-
-            if (oidTable == null) {
-                oidTable = Collections.<String,ObjectIdentifier>emptyMap();
-            }
-            initOidTable = true;
-        }
-
-        return oidTable.get(name.toUpperCase(Locale.ENGLISH));
+        return oidTable().get(name.toUpperCase(Locale.ENGLISH));
     }
 
     private static ObjectIdentifier oid(int ... values) {
         return ObjectIdentifier.newInternal(values);
     }
 
-    private static boolean initOidTable = false;
-    private static Map<String,ObjectIdentifier> oidTable;
+    private static volatile Map<String,ObjectIdentifier> oidTable;
     private static final Map<ObjectIdentifier,String> nameTable;
 
+    /** Returns the oidTable, lazily initializing it on first access. */
+    private static Map<String,ObjectIdentifier> oidTable()
+        throws IOException {
+        // Double checked locking; safe because oidTable is volatile
+        Map<String,ObjectIdentifier> tab;
+        if ((tab = oidTable) == null) {
+            synchronized (AlgorithmId.class) {
+                if ((tab = oidTable) == null)
+                    oidTable = tab = computeOidTable();
+            }
+        }
+        return tab;
+    }
+
+    /** Collects the algorithm names from the installed providers. */
+    private static HashMap<String,ObjectIdentifier> computeOidTable()
+        throws IOException {
+        HashMap<String,ObjectIdentifier> tab = new HashMap<>();
+        for (Provider provider : Security.getProviders()) {
+            for (Object key : provider.keySet()) {
+                String alias = (String)key;
+                String upperCaseAlias = alias.toUpperCase(Locale.ENGLISH);
+                int index;
+                if (upperCaseAlias.startsWith("ALG.ALIAS") &&
+                    (index=upperCaseAlias.indexOf("OID.", 0)) != -1) {
+                    index += "OID.".length();
+                    if (index == alias.length()) {
+                        // invalid alias entry
+                        break;
+                    }
+                    String oidString = alias.substring(index);
+                    String stdAlgName = provider.getProperty(alias);
+                    if (stdAlgName != null) {
+                        stdAlgName = stdAlgName.toUpperCase(Locale.ENGLISH);
+                    }
+                    if (stdAlgName != null &&
+                        tab.get(stdAlgName) == null) {
+                        tab.put(stdAlgName, new ObjectIdentifier(oidString));
+                    }
+                }
+            }
+        }
+        return tab;
+    }
+
     /*****************************************************************/
 
     /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/util/calendar/ZoneInfo.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/util/calendar/ZoneInfo.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/util/calendar/ZoneInfo.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/util/calendar/ZoneInfo.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -293,7 +293,7 @@
             int dstoffset = tz.getOffset(msec) - rawOffset;
 
             // Check if it's in a standard-to-daylight transition.
-            if (dstoffset > 0 && tz.getOffset(msec - dstoffset) == rawoffset) {
+            if (dstoffset > 0 && tz.getOffset(msec - dstoffset) == rawoffset && type == WALL_TIME) {
                 dstoffset = 0;
             }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/util/resources/LocaleNames.properties openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/util/resources/LocaleNames.properties
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/classes/sun/util/resources/LocaleNames.properties	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/classes/sun/util/resources/LocaleNames.properties	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2020, 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
@@ -57,7 +57,7 @@
 bh=Bihari
 bi=Bislama
 bm=Bambara
-bn=Bengali
+bn=Bangla
 bo=Tibetan
 br=Breton
 bs=Bosnian
@@ -87,10 +87,10 @@
 fj=Fijian
 fo=Faroese
 fr=French
-fy=Frisian
+fy=Western Frisian
 ga=Irish
 gd=Scottish Gaelic
-gl=Gallegan
+gl=Galician
 gn=Guarani
 gu=Gujarati
 gv=Manx
@@ -99,7 +99,7 @@
 hi=Hindi
 ho=Hiri Motu
 hr=Croatian
-ht=Haitian
+ht=Haitian Creole
 hu=Hungarian
 hy=Armenian
 hz=Herero
@@ -121,9 +121,9 @@
 ka=Georgian
 kg=Kongo
 ki=Kikuyu
-kj=Kwanyama
+kj=Kuanyama
 kk=Kazakh
-kl=Greenlandic
+kl=Kalaallisut
 km=Khmer
 kn=Kannada
 ko=Korean
@@ -132,7 +132,7 @@
 ku=Kurdish
 kv=Komi
 kw=Cornish
-ky=Kirghiz
+ky=Kyrgyz
 la=Latin
 lb=Luxembourgish
 lg=Ganda
@@ -167,15 +167,15 @@
 oc=Occitan
 oj=Ojibwa
 om=Oromo
-or=Oriya
-os=Ossetian
-pa=Panjabi
+or=Odia
+os=Ossetic
+pa=Punjabi
 pi=Pali
 pl=Polish
-ps=Pushto
+ps=Pashto
 pt=Portuguese
 qu=Quechua
-rm=Raeto-Romance
+rm=Romansh
 rn=Rundi
 ro=Romanian
 ru=Russian
@@ -185,7 +185,7 @@
 sd=Sindhi
 se=Northern Sami
 sg=Sango
-si=Sinhalese
+si=Sinhala
 sk=Slovak
 sl=Slovenian
 sm=Samoan
@@ -206,13 +206,13 @@
 tk=Turkmen
 tl=Tagalog
 tn=Tswana
-to=Tonga
+to=Tongan
 tr=Turkish
 ts=Tsonga
 tt=Tatar
 tw=Twi
 ty=Tahitian
-ug=Uighur
+ug=Uyghur
 uk=Ukrainian
 ur=Urdu
 uz=Uzbek
@@ -246,14 +246,14 @@
 alg=Algonquian
 alt=Southern Altai
 amh=Amharic
-ang=English, Old (ca.450-1100)
+ang=Old English
 anp=Angika
 apa=Apache
 ara=Arabic
-arc=Official Aramaic (700-300 BCE)
+arc=Aramaic
 arg=Aragonese
 arm=Armenian
-arn=Mapudungun
+arn=Mapuche
 arp=Arapaho
 art=Artificial
 arw=Arawak
@@ -273,7 +273,7 @@
 bam=Bambara
 ban=Balinese
 baq=Basque
-bas=Basa
+bas=Basaa
 bat=Baltic
 bej=Beja
 bel=Belarusian
@@ -298,7 +298,7 @@
 byn=Blin
 cad=Caddo
 cai=Central American Indian
-car=Galibi Carib
+car=Carib
 cat=Catalan
 cau=Caucasian
 ceb=Cebuano
@@ -310,7 +310,7 @@
 chi=Chinese
 chk=Chuukese
 chm=Mari
-chn=Chinook jargon
+chn=Chinook Jargon
 cho=Choctaw
 chp=Chipewyan
 chr=Cherokee
@@ -325,7 +325,7 @@
 cpf=Creoles and pidgins, French-based
 cpp=Creoles and pidgins, Portuguese-based
 cre=Cree
-crh=Crimean Tatar
+crh=Crimean Turkish
 crp=Creoles and pidgins
 csb=Kashubian
 cus=Cushitic
@@ -335,7 +335,7 @@
 dar=Dargwa
 day=Land Dayak
 del=Delaware
-den=Slave (Athapascan)
+den=Slave
 dgr=Dogrib
 din=Dinka
 div=Divehi
@@ -343,16 +343,16 @@
 dra=Dravidian
 dsb=Lower Sorbian
 dua=Duala
-dum=Dutch, Middle (ca.1050-1350)
+dum=Middle Dutch
 dut=Dutch
 dyu=Dyula
 dzo=Dzongkha
 efi=Efik
-egy=Egyptian (Ancient)
+egy=Ancient Egyptian
 eka=Ekajuk
 elx=Elamite
 eng=English
-enm=English, Middle (1100-1500)
+enm=Middle English
 epo=Esperanto
 est=Estonian
 ewe=Ewe
@@ -366,8 +366,8 @@
 fiu=Finno-Ugrian
 fon=Fon
 fre=French
-frm=French, Middle (ca.1400-1600)
-fro=French, Old (842-ca.1400)
+frm=Middle French
+fro=Old French
 frr=Northern Frisian
 frs=Eastern Frisian
 fry=Western Frisian
@@ -385,18 +385,18 @@
 gle=Irish
 glg=Galician
 glv=Manx
-gmh=German, Middle High (ca.1050-1500)
-goh=German, Old High (ca.750-1050)
+gmh=Middle High German
+goh=Old High German
 gon=Gondi
 gor=Gorontalo
 got=Gothic
 grb=Grebo
-grc=Greek, Ancient (to 1453)
+grc=Ancient Greek
 gre=Greek, Modern (1453-)
 grn=Guarani
 gsw=Swiss German
 guj=Gujarati
-gwi=Gwich'in
+gwi=Gwich\u02bcin
 hai=Haida
 hat=Haitian
 hau=Hausa
@@ -488,8 +488,8 @@
 lug=Ganda
 lui=Luiseno
 lun=Lunda
-luo=Luo (Kenya and Tanzania)
-lus=Lushai
+luo=Luo
+lus=Mizo
 mac=Macedonian
 mad=Madurese
 mag=Magahi
@@ -506,7 +506,7 @@
 mdf=Moksha
 mdr=Mandar
 men=Mende
-mga=Irish, Middle (900-1200)
+mga=Middle Irish
 mic=Mi'kmaq
 min=Minangkabau
 mis=Uncoded
@@ -519,9 +519,9 @@
 moh=Mohawk
 mon=Mongolian
 mos=Mossi
-mul=Multiple
+mul=Multiple languages
 mun=Munda
-mus=Creek
+mus=Muscogee
 mwl=Mirandese
 mwr=Marwari
 myn=Mayan
@@ -536,17 +536,17 @@
 ndo=Ndonga
 nds=Low German
 nep=Nepali
-new=Nepal Bhasa
+new=Newari
 nia=Nias
 nic=Niger-Kordofanian
 niu=Niuean
 nno=Norwegian Nynorsk
 nob=Bokm\u00e5l, Norwegian
 nog=Nogai
-non=Norse, Old
+non=Old Norse
 nor=Norwegian
-nqo=N'Ko
-nso=Pedi
+nqo=N\u2019Ko
+nso=Northern Sotho
 nub=Nubian
 nwc=Classical Newari
 nya=Chichewa
@@ -560,7 +560,7 @@
 orm=Oromo
 osa=Osage
 oss=Ossetian
-ota=Turkish, Ottoman (1500-1928)
+ota=Ottoman Turkish
 oto=Otomian
 paa=Papuan
 pag=Pangasinan
@@ -569,7 +569,7 @@
 pan=Panjabi
 pap=Papiamento
 pau=Palauan
-peo=Persian, Old (ca.600-400 B.C.)
+peo=Old Persian
 per=Persian
 phi=Philippine
 phn=Phoenician
@@ -578,7 +578,7 @@
 pon=Pohnpeian
 por=Portuguese
 pra=Prakrit
-pro=Proven\u00e7al, Old (to 1500)
+pro=Old Proven\u00e7al
 pus=Pushto; Pashto
 que=Quechua
 raj=Rajasthani
@@ -593,7 +593,7 @@
 rus=Russian
 sad=Sandawe
 sag=Sango
-sah=Yakut
+sah=Sakha
 sai=South American Indian
 sal=Salishan
 sam=Samaritan Aramaic
@@ -604,7 +604,7 @@
 sco=Scots
 sel=Selkup
 sem=Semitic
-sga=Irish, Old (to 900)
+sga=Old Irish
 sgn=Sign
 shn=Shan
 sid=Sidamo
@@ -624,7 +624,7 @@
 sna=Shona
 snd=Sindhi
 snk=Soninke
-sog=Sogdian
+sog=Sogdien
 som=Somali
 son=Songhai
 sot=Sotho, Southern
@@ -662,7 +662,7 @@
 tlh=Klingon
 tli=Tlingit
 tmh=Tamashek
-tog=Tonga (Nyasa)
+tog=Nyasa Tonga
 ton=Tonga (Tonga Islands)
 tpi=Tok Pisin
 tsi=Tsimshian
@@ -681,7 +681,7 @@
 uig=Uighur
 ukr=Ukrainian
 umb=Umbundu
-und=Undetermined
+und=Unknown language
 urd=Urdu
 uzb=Uzbek
 vai=Vai
@@ -690,7 +690,7 @@
 vol=Volap\u00fck
 vot=Votic
 wak=Wakashan
-wal=Wolaitta
+wal=Wolaytta
 war=Waray
 was=Washo
 wel=Welsh
@@ -725,7 +725,7 @@
 Bamu=Bamum
 Bass=Bassa Vah
 Batk=Batak
-Beng=Bengali
+Beng=Bangla
 Blis=Blissymbols
 Bopo=Bopomofo
 Brah=Brahmi
@@ -750,7 +750,7 @@
 Egyp=Egyptian hieroglyphs
 Elba=Elbasan
 Ethi=Ethiopic
-Geok=Khutsuri
+Geok=Georgian Khutsuri
 Geor=Georgian
 Glag=Glagolitic
 Goth=Gothic
@@ -761,12 +761,12 @@
 Hang=Hangul
 Hani=Han
 Hano=Hanunoo
-Hans=Simplified Han
-Hant=Traditional Han
+Hans=Simplified
+Hant=Traditional
 Hebr=Hebrew
 Hira=Hiragana
 Hmng=Pahawh Hmong
-Hrkt=Katakana or Hiragana
+Hrkt=Japanese syllabaries
 Hung=Old Hungarian
 Inds=Indus
 Ital=Old Italic
@@ -780,7 +780,7 @@
 Kore=Korean
 Kpel=Kpelle
 Kthi=Kaithi
-Lana=Tai Tham
+Lana=Lanna
 Laoo=Lao
 Latf=Fraktur Latin
 Latg=Gaelic Latin
@@ -789,11 +789,11 @@
 Limb=Limbu
 Lina=Linear A
 Linb=Linear B
-Lisu=Lisu
+Lisu=Fraser
 Loma=Loma
 Lyci=Lycian
 Lydi=Lydian
-Mand=Mandaic
+Mand=Mandaean
 Mani=Manichaean
 Maya=Mayan hieroglyphs
 Mend=Mende
@@ -806,12 +806,12 @@
 Mymr=Myanmar
 Narb=Old North Arabian
 Nbat=Nabataean
-Nkgb=Nakhi Geba
+Nkgb=Naxi Geba
 Nkoo=N\u2019Ko
 Ogam=Ogham
 Olck=Ol Chiki
 Orkh=Orkhon
-Orya=Oriya
+Orya=Odia
 Osma=Osmanya
 Palm=Palmyrene
 Perm=Old Permic
@@ -820,7 +820,7 @@
 Phlp=Psalter Pahlavi
 Phlv=Book Pahlavi
 Phnx=Phoenician
-Plrd=Miao
+Plrd=Pollard Phonetic
 Prti=Inscriptional Parthian
 Rjng=Rejang
 Roro=Rongorongo
@@ -831,7 +831,7 @@
 Saur=Saurashtra
 Sgnw=SignWriting
 Shaw=Shavian
-Sind=Sindhi
+Sind=Khudawadi
 Sinh=Sinhala
 Sund=Sundanese
 Sylo=Syloti Nagri
@@ -854,16 +854,16 @@
 Ugar=Ugaritic
 Vaii=Vai
 Visp=Visible Speech
-Wara=Warang Citi
+Wara=Varang Kshiti
 Xpeo=Old Persian
 Xsux=Sumero-Akkadian Cuneiform
 Yiii=Yi
-Zinh=Inherited script
+Zinh=Inherited
 Zmth=Mathematical Notation
 Zsym=Symbols
 Zxxx=Unwritten
-Zyyy=Undetermined script
-Zzzz=Uncoded script
+Zyyy=Common
+Zzzz=Unknown Script
 
 # country names
 # key is ISO 3166 country code
@@ -871,7 +871,7 @@
 AD=Andorra
 AE=United Arab Emirates
 AF=Afghanistan
-AG=Antigua and Barbuda
+AG=Antigua & Barbuda
 AI=Anguilla
 AL=Albania
 AM=Armenia
@@ -885,7 +885,7 @@
 AW=Aruba
 AX=\u00c5land Islands
 AZ=Azerbaijan
-BA=Bosnia and Herzegovina
+BA=Bosnia & Herzegovina
 BB=Barbados
 BD=Bangladesh
 BE=Belgium
@@ -894,11 +894,11 @@
 BH=Bahrain
 BI=Burundi
 BJ=Benin
-BL=Saint Barth\u00e9lemy
+BL=St. Barth\u00e9lemy
 BM=Bermuda
 BN=Brunei
 BO=Bolivia
-BQ=Bonaire, Sint Eustatius and Saba
+BQ=Caribbean Netherlands
 BR=Brazil
 BS=Bahamas
 BT=Bhutan
@@ -907,12 +907,12 @@
 BY=Belarus
 BZ=Belize
 CA=Canada
-CC=Cocos Islands
-CD=The Democratic Republic Of Congo
+CC=Cocos (Keeling) Islands
+CD=Congo - Kinshasa
 CF=Central African Republic
-CG=Congo
+CG=Congo - Brazzaville
 CH=Switzerland
-CI=C\u00F4te d'Ivoire
+CI=C\u00f4te d\u2019Ivoire
 CK=Cook Islands
 CL=Chile
 CM=Cameroon
@@ -925,7 +925,7 @@
 CW=Cura\u00e7ao
 CX=Christmas Island
 CY=Cyprus
-CZ=Czech Republic
+CZ=Czechia
 DE=Germany
 DJ=Djibouti
 DK=Denmark
@@ -959,13 +959,13 @@
 GP=Guadeloupe
 GQ=Equatorial Guinea
 GR=Greece
-GS=South Georgia And The South Sandwich Islands
+GS=South Georgia & South Sandwich Islands
 GT=Guatemala
 GU=Guam
 GW=Guinea-Bissau
 GY=Guyana
-HK=Hong Kong
-HM=Heard Island And McDonald Islands
+HK=Hong Kong SAR China
+HM=Heard & McDonald Islands
 HN=Honduras
 HR=Croatia
 HT=Haiti
@@ -973,7 +973,7 @@
 ID=Indonesia
 IE=Ireland
 IL=Israel
-IM=Isle Of Man
+IM=Isle of Man
 IN=India
 IO=British Indian Ocean Territory
 IQ=Iraq
@@ -989,7 +989,7 @@
 KH=Cambodia
 KI=Kiribati
 KM=Comoros
-KN=Saint Kitts And Nevis
+KN=St. Kitts & Nevis
 KP=North Korea
 KR=South Korea
 KW=Kuwait
@@ -997,7 +997,7 @@
 KZ=Kazakhstan
 LA=Laos
 LB=Lebanon
-LC=Saint Lucia
+LC=St. Lucia
 LI=Liechtenstein
 LK=Sri Lanka
 LR=Liberia
@@ -1010,14 +1010,14 @@
 MC=Monaco
 MD=Moldova
 ME=Montenegro
-MF=Saint Martin
+MF=St. Martin
 MG=Madagascar
 MH=Marshall Islands
-MK=Macedonia
+MK=North Macedonia
 ML=Mali
-MM=Myanmar
+MM=Myanmar (Burma)
 MN=Mongolia
-MO=Macao
+MO=Macao SAR China
 MP=Northern Mariana Islands
 MQ=Martinique
 MR=Mauritania
@@ -1049,15 +1049,15 @@
 PH=Philippines
 PK=Pakistan
 PL=Poland
-PM=Saint Pierre And Miquelon
-PN=Pitcairn
+PM=St. Pierre & Miquelon
+PN=Pitcairn Islands
 PR=Puerto Rico
-PS=Palestine
+PS=Palestinian Territories
 PT=Portugal
 PW=Palau
 PY=Paraguay
 QA=Qatar
-RE=Reunion
+RE=R\u00e9union
 RO=Romania
 RS=Serbia
 RU=Russia
@@ -1068,9 +1068,9 @@
 SD=Sudan
 SE=Sweden
 SG=Singapore
-SH=Saint Helena
+SH=St. Helena
 SI=Slovenia
-SJ=Svalbard And Jan Mayen
+SJ=Svalbard & Jan Mayen
 SK=Slovakia
 SL=Sierra Leone
 SM=San Marino
@@ -1078,12 +1078,12 @@
 SO=Somalia
 SR=Suriname
 SS=South Sudan
-ST=Sao Tome And Principe
+ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
 SV=El Salvador
-SX=Sint Maarten (Dutch part)
+SX=Sint Maarten
 SY=Syria
-SZ=Swaziland
-TC=Turks And Caicos Islands
+SZ=Eswatini
+TC=Turks & Caicos Islands
 TD=Chad
 TF=French Southern Territories
 TG=Togo
@@ -1095,24 +1095,24 @@
 TN=Tunisia
 TO=Tonga
 TR=Turkey
-TT=Trinidad and Tobago
+TT=Trinidad & Tobago
 TV=Tuvalu
 TW=Taiwan
 TZ=Tanzania
 UA=Ukraine
 UG=Uganda
-UM=United States Minor Outlying Islands
+UM=U.S. Outlying Islands
 US=United States
 UY=Uruguay
 UZ=Uzbekistan
-VA=Vatican
-VC=Saint Vincent And The Grenadines
+VA=Vatican City
+VC=St. Vincent & Grenadines
 VE=Venezuela
 VG=British Virgin Islands
 VI=U.S. Virgin Islands
 VN=Vietnam
 VU=Vanuatu
-WF=Wallis And Futuna
+WF=Wallis & Futuna
 WS=Samoa
 YE=Yemen
 YT=Mayotte
@@ -1139,9 +1139,9 @@
 029=Caribbean
 030=Eastern Asia
 034=Southern Asia
-035=South-Eastern Asia
+035=Southeast Asia
 039=Southern Europe
-053=Australia and New Zealand
+053=Australasia
 054=Melanesia
 057=Micronesian Region
 061=Polynesia
@@ -1152,7 +1152,7 @@
 151=Eastern Europe
 154=Northern Europe
 155=Western Europe
-419=Latin America and the Caribbean
+419=Latin America
 
 # variant names
 # key is %%variant
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk-8-8u312-b07/=unpacked-tar3=/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2021-09-01 14:33:15.000000000 +0000
@@ -1712,7 +1712,7 @@
     // Releases the specified inflater to the list of available inflaters.
     private void releaseDeflater(Deflater def) {
         synchronized (deflaters) {
-            if (inflaters.size() < MAX_FLATER) {
+            if (deflaters.size() < MAX_FLATER) {
                def.reset();
                deflaters.add(def);
             } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/InvocationAdapter.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/InvocationAdapter.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/InvocationAdapter.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/InvocationAdapter.c	2021-09-01 14:33:15.000000000 +0000
@@ -373,7 +373,7 @@
          * class name. The manifest is in UTF8 so need to convert to
          * modified UTF8 (see JNI spec).
          */
-        oldLen = strlen(agentClass);
+        oldLen = (int)strlen(agentClass);
         newLen = modifiedUtf8LengthOfUtf8(agentClass, oldLen);
         /*
          * According to JVMS class name is represented as CONSTANT_Utf8_info,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/JarFacade.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/JarFacade.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/JarFacade.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/JarFacade.c	2021-09-01 14:33:15.000000000 +0000
@@ -23,14 +23,6 @@
  * questions.
  */
 
-#ifdef _WIN32
-/*
- * Win* needs this include. However, Linux and Solaris do not.
- * Having this include on Solaris SPARC breaks having non US-ASCII
- * characters in the value of the Premain-Class attribute.
- */
-#include <ctype.h>
-#endif /* _WIN32 */
 #include <string.h>
 #include <stdlib.h>
 
@@ -58,13 +50,13 @@
             size_t value_len;
 
             /* skip any leading white space */
-            while (isspace(*begin)) {
+            while (*begin == ' ') {
                 begin++;
             }
 
             /* skip any trailing white space */
             end = &begin[strlen(begin)];
-            while (end > begin && isspace(end[-1])) {
+            while (end > begin && end[-1] == ' ') {
                 end--;
             }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/PathCharsValidator.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/PathCharsValidator.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/instrument/PathCharsValidator.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/instrument/PathCharsValidator.c	2021-09-01 14:33:15.000000000 +0000
@@ -46,9 +46,9 @@
 
 /* Compute the low-order mask for the characters in the given string */
 static jlong lowMask(char* s) {
-    int n = strlen(s);
+    size_t n = strlen(s);
     jlong m = 0;
-    int i;
+    size_t i;
     for (i = 0; i < n; i++) {
         int c = (int)s[i];
         if (c < 64)
@@ -59,9 +59,9 @@
 
 /* Compute the high-order mask for the characters in the given string */
 static jlong highMask(char* s) {
-    int n = strlen(s);
+    size_t n = strlen(s);
     jlong m = 0;
-    int i;
+    size_t i;
     for (i = 0; i < n; i++) {
         int c = (int)s[i];
         if ((c >= 64) && (c < 128))
@@ -168,7 +168,7 @@
  * illegal characters. Returns 0 if only validate characters are present.
  */
 int validatePathChars(const char* path) {
-    int i, n;
+    size_t i, n;
 
     /* initialize on first usage */
     if (L_HEX == 0) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-aix openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-aix
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-aix	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-aix	2021-09-01 14:33:15.000000000 +0000
@@ -1193,6 +1193,16 @@
 #jdk.security.allowNonCaAnchor=true
 
 #
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
 # JNDI Object Factories Filter
 #
 # This filter is used by the JNDI runtime to control the set of object factory classes
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-linux openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-linux
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-linux	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-linux	2021-09-01 14:33:15.000000000 +0000
@@ -1199,6 +1199,16 @@
 #jdk.security.allowNonCaAnchor=true
 
 #
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
 # JNDI Object Factories Filter
 #
 # This filter is used by the JNDI runtime to control the set of object factory classes
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-macosx openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-macosx
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-macosx	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-macosx	2021-09-01 14:33:15.000000000 +0000
@@ -1197,6 +1197,16 @@
 #jdk.security.allowNonCaAnchor=true
 
 #
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
 # JNDI Object Factories Filter
 #
 # This filter is used by the JNDI runtime to control the set of object factory classes
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-solaris openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-solaris
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-solaris	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-solaris	2021-09-01 14:33:15.000000000 +0000
@@ -1195,6 +1195,16 @@
 #jdk.security.allowNonCaAnchor=true
 
 #
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
 # JNDI Object Factories Filter
 #
 # This filter is used by the JNDI runtime to control the set of object factory classes
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-windows openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-windows
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/lib/security/java.security-windows	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/lib/security/java.security-windows	2021-09-01 14:33:15.000000000 +0000
@@ -1197,6 +1197,16 @@
 #jdk.security.allowNonCaAnchor=true
 
 #
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
 # JNDI Object Factories Filter
 #
 # This filter is used by the JNDI runtime to control the set of object factory classes
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/java/util/jar/pack/bands.cpp openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/java/util/jar/pack/bands.cpp
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/java/util/jar/pack/bands.cpp	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/java/util/jar/pack/bands.cpp	2021-09-01 14:33:15.000000000 +0000
@@ -288,7 +288,7 @@
   { e_##name,  #name, /*debug only*/ \
     cspec, ix }
 
-const band_init all_band_inits[] = {
+const band_init all_band_inits[BAND_LIMIT+1] = {
 //BAND_INIT(archive_magic, BYTE1_spec, 0),
 //BAND_INIT(archive_header, UNSIGNED5_spec, 0),
 //BAND_INIT(band_headers, BYTE1_spec, 0),
@@ -448,14 +448,8 @@
   BAND_INIT(file_modtime, DELTA5_spec, 0),
   BAND_INIT(file_options, UNSIGNED5_spec, 0),
 //BAND_INIT(file_bits, BYTE1_spec, 0),
-#ifndef PRODUCT
-  { 0, 0, 0, 0 }
-#else
-  { 0, 0 }
-#endif
+  { 0, NULL, 0, 0 }
 };
-#define NUM_BAND_INITS \
-        (sizeof(all_band_inits)/sizeof(all_band_inits[0]))
 
 band* band::makeBands(unpacker* u) {
   band* tmp_all_bands = U_NEW(band, BAND_LIMIT);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/media/sound/MidiOutDevice.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/media/sound/MidiOutDevice.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/media/sound/MidiOutDevice.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/media/sound/MidiOutDevice.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2020, 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
@@ -133,7 +133,7 @@
     }
     /* "continuation" sysex messages start with F7 (instead of F0), but
        are sent without the F7. */
-    if (data[0] == 0xF7) {
+    if (data[0] == 0xF7 && size > 1) {
         data++;
         size--;
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/media/sound/PlatformMidi.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/media/sound/PlatformMidi.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/com/sun/media/sound/PlatformMidi.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/com/sun/media/sound/PlatformMidi.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -29,6 +29,8 @@
 
 #include "PlatformMidi.h"
 
+#include <stdlib.h>
+
 char* GetInternalErrorStr(INT32 err) {
     switch (err) {
     case MIDI_SUCCESS:          return "";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/ZipFile.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/ZipFile.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/ZipFile.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/ZipFile.c	2021-09-01 14:33:15.000000000 +0000
@@ -147,6 +147,14 @@
     return zip->locsig;
 }
 
+JNIEXPORT jint JNICALL
+Java_java_util_zip_ZipFile_getManifestNum(JNIEnv *env, jclass cls, jlong zfile)
+{
+    jzfile *zip = jlong_to_ptr(zfile);
+
+    return zip->manifestNum;
+}
+
 JNIEXPORT void JNICALL
 Java_java_util_zip_ZipFile_close(JNIEnv *env, jclass cls, jlong zfile)
 {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.c	2021-09-01 14:33:15.000000000 +0000
@@ -74,6 +74,8 @@
 #define PATH_MAX 1024
 #endif
 
+#define META_INF_LEN 9 /* "META-INF/".length() */
+
 static jint INITIAL_META_COUNT = 2;   /* initial number of entries in meta name array */
 
 /*
@@ -444,6 +446,25 @@
 }
 
 /*
+ * Check if the bytes represents a name equals to MANIFEST.MF
+ */
+static int
+isManifestName(const char *name, int length)
+{
+    const char *s;
+    if (length != (int)sizeof("MANIFEST.MF") - 1)
+        return 0;
+    for (s = "MANIFEST.MF"; *s != '\0'; s++) {
+        char c = *name++;
+        // Avoid toupper; it's locale-dependent
+        if (c >= 'a' && c <= 'z') c += 'A' - 'a';
+        if (*s != c)
+            return 0;
+    }
+    return 1;
+}
+
+/*
  * Increases the capacity of zip->metanames.
  * Returns non-zero in case of allocation error.
  */
@@ -513,6 +534,7 @@
 {
     free(zip->entries); zip->entries = NULL;
     free(zip->table);   zip->table   = NULL;
+    zip->manifestNum = 0;
     freeMetaNames(zip);
 }
 
@@ -666,6 +688,8 @@
     for (j = 0; j < tablelen; j++)
         table[j] = ZIP_ENDCHAIN;
 
+    zip->manifestNum = 0;
+
     /* Iterate through the entries in the central directory */
     for (i = 0, cp = cenbuf; cp <= cenend - CENHDR; i++, cp += CENSIZE(cp)) {
         /* Following are unsigned 16-bit */
@@ -693,9 +717,12 @@
             ZIP_FORMAT_ERROR("invalid CEN header (bad header size)");
 
         /* if the entry is metadata add it to our metadata names */
-        if (isMetaName((char *)cp+CENHDR, nlen))
+        if (isMetaName((char *)cp+CENHDR, nlen)) {
+            if (isManifestName((char *)cp+CENHDR+META_INF_LEN, nlen-META_INF_LEN))
+                zip->manifestNum++;
             if (addMetaName(zip, (char *)cp+CENHDR, nlen) != 0)
                 goto Catch;
+        }
 
         /* Record the CEN offset and the name hash in our hash cell. */
         entries[i].cenpos = cenpos + (cp - cenbuf);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/java/util/zip/zip_util.h	2021-09-01 14:33:15.000000000 +0000
@@ -229,6 +229,7 @@
     char **metanames;     /* array of meta names (may have null names) */
     jint metacurrent;     /* the next empty slot in metanames array */
     jint metacount;       /* number of slots in metanames array */
+    jint manifestNum;     /* number of META-INF/MANIFEST.MF, case insensitive */
     jlong lastModified;   /* last modified time */
     jlong locpos;         /* position of first LOC header (usually 0) */
 } jzfile;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.c	2021-09-01 14:33:15.000000000 +0000
@@ -38,6 +38,8 @@
 #include "GraphicsPrimitiveMgr.h"
 #include "Region.h"
 
+#include "jvm.h"
+
 /**
  * The following methods are implemented in the windowing system (i.e. GLX
  * and WGL) source files.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLContext.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -122,8 +122,6 @@
     sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP
 #define CAPS_EXT_FBOBJECT    \
     sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT
-#define CAPS_STORED_ALPHA    \
-    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA
 #define CAPS_DOUBLEBUFFERED  \
     sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED
 #define CAPS_EXT_LCD_SHADER  \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLSurfaceData.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLSurfaceData.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/java2d/opengl/OGLSurfaceData.h	2021-09-01 14:33:15.000000000 +0000
@@ -121,7 +121,7 @@
  * x/yOffset would be (0,0) (the same applies to pbuffers).
  *
  *     jint width/height;
- * The cached surface bounds.  For offscreen surface types (OGLSD_PBUFFER,
+ * The cached surface bounds.  For offscreen surface types (OGLSD_FBOBJECT,
  * OGLSD_TEXTURE, etc.) these values must remain constant.  Onscreen window
  * surfaces (OGLSD_WINDOW, OGLSD_FLIP_BACKBUFFER, etc.) may have their
  * bounds changed in response to a programmatic or user-initiated event, so
@@ -222,7 +222,6 @@
  */
 #define OGLSD_UNDEFINED       sun_java2d_pipe_hw_AccelSurface_UNDEFINED
 #define OGLSD_WINDOW          sun_java2d_pipe_hw_AccelSurface_WINDOW
-#define OGLSD_PBUFFER         sun_java2d_pipe_hw_AccelSurface_RT_PLAIN
 #define OGLSD_TEXTURE         sun_java2d_pipe_hw_AccelSurface_TEXTURE
 #define OGLSD_FLIP_BACKBUFFER sun_java2d_pipe_hw_AccelSurface_FLIP_BACKBUFFER
 #define OGLSD_FBOBJECT        sun_java2d_pipe_hw_AccelSurface_RT_TEXTURE
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/misc/URLClassPath.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/misc/URLClassPath.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/misc/URLClassPath.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/misc/URLClassPath.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -24,6 +24,7 @@
  */
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "jni.h"
 #include "jni_util.h"
@@ -31,6 +32,10 @@
 #include "jvm.h"
 #include "jdk_util.h"
 
+/* defined in libverify.so/verify.dll (src file common/check_format.c) */
+extern jboolean VerifyClassname(char *utf_name, jboolean arrayAllowed);
+extern jboolean VerifyFixClassname(char *utf_name);
+
 #include "sun_misc_URLClassPath.h"
 
 extern char*
@@ -55,7 +60,7 @@
         // getUTF() throws OOME before returning NULL, no need to throw OOME here
         return result;
     }
-    VerifyFixClassname(clname);
+    (void)VerifyFixClassname(clname);
 
     if (!VerifyClassname(clname, JNI_TRUE)) {  /* expects slashed name */
         goto done;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c	2021-09-01 14:33:15.000000000 +0000
@@ -430,11 +430,11 @@
 
     checkStatus(env, jobj, major, minor, "[GSSLibStub_canonicalizeName]");
     if ((*env)->ExceptionCheck(env)) {
-      return (jlong) GSS_C_NO_NAME;
+      return ptr_to_jlong(GSS_C_NO_NAME);
     }
     return ptr_to_jlong(mnNameHdl);
   }
-  return (jlong) GSS_C_NO_NAME;
+  return ptr_to_jlong(GSS_C_NO_NAME);
 }
 
 /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/krb5/nativeccache.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/krb5/nativeccache.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/krb5/nativeccache.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/krb5/nativeccache.c	2021-09-01 14:33:15.000000000 +0000
@@ -25,6 +25,8 @@
 
 #import "sun_security_krb5_Credentials.h"
 #import <Kerberos/Kerberos.h>
+#import <string.h>
+#import <time.h>
 
 /*
  * Based largely on klist.c,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.c	2021-09-01 14:33:15.000000000 +0000
@@ -153,8 +153,7 @@
     jobject jList, jModule;
     jmethodID jListConstructor, jAdd, jModuleConstructor;
     jstring jCommonName, jDllName;
-    jboolean jFIPS;
-    jint i;
+    jint i, jSlotID;
 
     if (getModuleList == NULL) {
         dprintf("-getmodulelist function not found\n");
@@ -187,7 +186,7 @@
         return NULL;
     }
     jModuleConstructor = (*env)->GetMethodID(env, jModuleClass, "<init>",
-        "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)V");
+        "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V");
     if (jModuleConstructor == NULL) {
         return NULL;
     }
@@ -213,10 +212,15 @@
                 return NULL;
             }
         }
-        jFIPS = module->isFIPS;
         for (i = 0; i < module->slotCount; i++ ) {
+            jSlotID = module->slots[i]->slotID;
+            if (jDllName == NULL && jSlotID != NETSCAPE_SLOT_ID &&
+                    jSlotID != PRIVATE_KEY_SLOT_ID && jSlotID != FIPS_SLOT_ID) {
+                // Ignore unknown slot IDs in the NSS Internal Module. See JDK-8265462.
+                continue;
+            }
             jModule = (*env)->NewObject(env, jModuleClass, jModuleConstructor,
-                jLibDir, jDllName, jCommonName, jFIPS, i);
+                    jLibDir, jDllName, jCommonName, i, jSlotID);
             if (jModule == NULL) {
                 return NULL;
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/j2secmod.h	2021-09-01 14:33:15.000000000 +0000
@@ -51,32 +51,150 @@
 // NSS types
 
 typedef int PRBool;
+typedef unsigned short PRUint16;
+typedef short PRInt16;
+typedef unsigned int PRUint32;
+typedef int PRInt32;
+typedef long long PRInt64;
+
+typedef PRUint32 PRIntervalTime;
+typedef PRInt64 PRTime;
+
+typedef struct PK11SlotInfoStr PK11SlotInfo;
 
 typedef struct SECMODModuleStr SECMODModule;
 typedef struct SECMODModuleListStr SECMODModuleList;
 
+// Defined in NSS's secmodt.h header
+/* PKCS #11 disable reasons */
+typedef enum {
+    PK11_DIS_NONE = 0,
+    PK11_DIS_USER_SELECTED = 1,
+    PK11_DIS_COULD_NOT_INIT_TOKEN = 2,
+    PK11_DIS_TOKEN_VERIFY_FAILED = 3,
+    PK11_DIS_TOKEN_NOT_PRESENT = 4
+} PK11DisableReasons;
+
+// Slot IDs - defined in Secmod.java on the Java side
+// Values obtained from NSS's pkcs11i.h header
+#define NETSCAPE_SLOT_ID 1
+#define PRIVATE_KEY_SLOT_ID 2
+#define FIPS_SLOT_ID 3
+
+// Defined in NSS's secmodti.h header
+/* represent a pkcs#11 slot reference counted. */
+struct PK11SlotInfoStr {
+    /* the PKCS11 function list for this slot */
+    void *functionList;
+    SECMODModule *module; /* our parent module */
+    /* Boolean to indicate the current state of this slot */
+    PRBool needTest;           /* Has this slot been tested for Export complience */
+    PRBool isPerm;             /* is this slot a permanment device */
+    PRBool isHW;               /* is this slot a hardware device */
+    PRBool isInternal;         /* is this slot one of our internal PKCS #11 devices */
+    PRBool disabled;           /* is this slot disabled... */
+    PK11DisableReasons reason; /* Why this slot is disabled */
+    PRBool readOnly;           /* is the token in this slot read-only */
+    PRBool needLogin;          /* does the token of the type that needs
+                                * authentication (still true even if token is logged
+                                * in) */
+    PRBool hasRandom;          /* can this token generated random numbers */
+    PRBool defRWSession;       /* is the default session RW (we open our default
+                                * session rw if the token can only handle one session
+                                * at a time. */
+    PRBool isThreadSafe;       /* copied from the module */
+    /* The actual flags (many of which are distilled into the above PRBools) */
+    CK_FLAGS flags; /* flags from PKCS #11 token Info */
+    /* a default session handle to do quick and dirty functions */
+    CK_SESSION_HANDLE session;
+    void *sessionLock; /* lock for this session */
+    /* our ID */
+    CK_SLOT_ID slotID;
+    /* persistant flags saved from startup to startup */
+    unsigned long defaultFlags;
+    /* keep track of who is using us so we don't accidently get freed while
+     * still in use */
+    PRInt32 refCount; /* to be in/decremented by atomic calls ONLY! */
+    void *freeListLock;
+    void *freeSymKeysWithSessionHead;
+    void *freeSymKeysHead;
+    int keyCount;
+    int maxKeyCount;
+    /* Password control functions for this slot. many of these are only
+     * active if the appropriate flag is on in defaultFlags */
+    int askpw;           /* what our password options are */
+    int timeout;         /* If we're ask_timeout, what is our timeout time is
+                          * seconds */
+    int authTransact;    /* allow multiple authentications off one password if
+                          * they are all part of the same transaction */
+    PRTime authTime;     /* when were we last authenticated */
+    int minPassword;     /* smallest legal password */
+    int maxPassword;     /* largest legal password */
+    PRUint16 series;     /* break up the slot info into various groups of
+                          * inserted tokens so that keys and certs can be
+                          * invalidated */
+    PRUint16 flagSeries; /* record the last series for the last event
+                          * returned for this slot */
+    PRBool flagState;    /* record the state of the last event returned for this
+                          * slot. */
+    PRUint16 wrapKey;    /* current wrapping key for SSL master secrets */
+    CK_MECHANISM_TYPE wrapMechanism;
+    /* current wrapping mechanism for current wrapKey */
+    CK_OBJECT_HANDLE refKeys[1];      /* array of existing wrapping keys for */
+    CK_MECHANISM_TYPE *mechanismList; /* list of mechanism supported by this
+                                       * token */
+    int mechanismCount;
+    /* cache the certificates stored on the token of this slot */
+    void **cert_array;
+    int array_size;
+    int cert_count;
+    char serial[16];
+    /* since these are odd sizes, keep them last. They are odd sizes to
+     * allow them to become null terminated strings */
+    char slot_name[65];
+    char token_name[33];
+    PRBool hasRootCerts;
+    PRBool hasRootTrust;
+    PRBool hasRSAInfo;
+    CK_FLAGS RSAInfoFlags;
+    PRBool protectedAuthPath;
+    PRBool isActiveCard;
+    PRIntervalTime lastLoginCheck;
+    unsigned int lastState;
+    /* for Stan */
+    void *nssToken;
+    /* the tokeninfo struct */
+    CK_TOKEN_INFO tokenInfo;
+    /* fast mechanism lookup */
+    char mechanismBits[256];
+    CK_PROFILE_ID *profileList;
+    int profileCount;
+};
+
+// Defined in NSS's secmodt.h header
 struct SECMODModuleStr {
-    void        *v1;
-    PRBool      internal;       /* true of internally linked modules, false
-                                 * for the loaded modules */
-    PRBool      loaded;         /* Set to true if module has been loaded */
-    PRBool      isFIPS;         /* Set to true if module is finst internal */
-    char        *dllName;       /* name of the shared library which implements
-                                 * this module */
-    char        *commonName;    /* name of the module to display to the user */
-    void        *library;       /* pointer to the library. opaque. used only by
-                                 * pk11load.c */
-
-    void        *functionList; /* The PKCS #11 function table */
-    void        *refLock;       /* only used pk11db.c */
-    int         refCount;       /* Module reference count */
-    void        **slots;        /* array of slot points attached to this mod*/
-    int         slotCount;      /* count of slot in above array */
-    void        *slotInfo;      /* special info about slots default settings */
-    int         slotInfoCount;  /* count */
+    void         *v1;
+    PRBool       internal;       /* true of internally linked modules, false
+                                  * for the loaded modules */
+    PRBool       loaded;         /* Set to true if module has been loaded */
+    PRBool       isFIPS;         /* Set to true if module is finst internal */
+    char         *dllName;       /* name of the shared library which implements
+                                  * this module */
+    char         *commonName;    /* name of the module to display to the user */
+    void         *library;       /* pointer to the library. opaque. used only by
+                                  * pk11load.c */
+
+    void         *functionList; /* The PKCS #11 function table */
+    void         *refLock;       /* only used pk11db.c */
+    int          refCount;       /* Module reference count */
+    PK11SlotInfo **slots;        /* array of slot points attached to this mod*/
+    int          slotCount;      /* count of slot in above array */
+    void         *slotInfo;      /* special info about slots default settings */
+    int          slotInfoCount;  /* count */
     // incomplete, sizeof() is wrong
 };
 
+// Defined in NSS's secmodt.h header
 struct SECMODModuleListStr {
     SECMODModuleList    *next;
     SECMODModule        *module;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c	2021-09-01 14:33:15.000000000 +0000
@@ -721,7 +721,7 @@
     }
 
     // populate using java values
-    ckParamPtr->prfMechanism = jLongToCKULong(jPrfMechanism);
+    ckParamPtr->prfHashMechanism = jLongToCKULong(jPrfMechanism);
     ckParamPtr->ulMacLength = jLongToCKULong(jUlMacLength);
     ckParamPtr->ulServerOrClient = jLongToCKULong(jUlServerOrClient);
 
@@ -1014,17 +1014,18 @@
 }
 
 /*
- * converts the Java CK_GCM_PARAMS object to a CK_GCM_PARAMS pointer
+ * converts the Java CK_GCM_PARAMS object to a CK_GCM_PARAMS_NO_IVBITS pointer
+ * Note: Need to try NSS definition first to avoid SIGSEGV.
  *
  * @param env - used to call JNI funktions to get the Java classes and objects
  * @param jParam - the Java CK_GCM_PARAMS object to convert
  * @param pLength - length of the allocated memory of the returned pointer
- * @return pointer to the new CK_GCM_PARAMS structure
+ * @return pointer to the new CK_GCM_PARAMS_NO_IVBITS structure
  */
-CK_GCM_PARAMS_PTR
+CK_GCM_PARAMS_NO_IVBITS_PTR
 jGCMParamsToCKGCMParamPtr(JNIEnv *env, jobject jParam, CK_ULONG *pLength)
 {
-    CK_GCM_PARAMS_PTR ckParamPtr;
+    CK_GCM_PARAMS_NO_IVBITS_PTR ckParamPtr;
     jclass jGcmParamsClass;
     jfieldID fieldID;
     jobject jIv, jAad;
@@ -1052,8 +1053,8 @@
     if (fieldID == NULL) { return NULL; }
     jTagLen = (*env)->GetLongField(env, jParam, fieldID);
 
-    // allocate memory for CK_GCM_PARAMS pointer
-    ckParamPtr = calloc(1, sizeof(CK_GCM_PARAMS));
+    // allocate memory for CK_GCM_PARAMS_NO_IVBITS pointer
+    ckParamPtr = calloc(1, sizeof(CK_GCM_PARAMS_NO_IVBITS));
     if (ckParamPtr == NULL) {
         throwOutOfMemoryError(env, 0);
         return NULL;
@@ -1073,16 +1074,15 @@
     ckParamPtr->ulTagBits = jLongToCKULong(jTagLen);
 
     if (pLength != NULL) {
-        *pLength = sizeof(CK_GCM_PARAMS);
+        *pLength = sizeof(CK_GCM_PARAMS_NO_IVBITS);
     }
-    TRACE1("Created inner GCM_PARAMS PTR %lX\n", ptr_to_jlong(ckParamPtr));
+    TRACE1("Created inner GCM_PARAMS PTR w/o ulIvBits %p\n", ckParamPtr);
     return ckParamPtr;
 cleanup:
     free(ckParamPtr->pIv);
     free(ckParamPtr->pAAD);
     free(ckParamPtr);
     return NULL;
-
 }
 
 /*
@@ -1179,7 +1179,7 @@
         throwOutOfMemoryError(env, 0);
         return NULL;
     }
-    TRACE1("DEBUG jMechanismToCKMechanismPtr: allocated mech 0x%lX\n", ckpMech);
+    TRACE1("DEBUG jMechanismToCKMechanismPtr: allocated mech %p\n", ckpMech);
 
     ckpMech->mechanism = jLongToCKULong(jMechType);
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c	2021-09-01 14:33:15.000000000 +0000
@@ -72,6 +72,7 @@
 {
     CK_SESSION_HANDLE ckSessionHandle;
     CK_MECHANISM_PTR ckpMechanism = NULL;
+    CK_MECHANISM_PTR ckpTemp;
     CK_OBJECT_HANDLE ckKeyHandle;
     CK_RV rv;
 
@@ -81,15 +82,32 @@
     ckSessionHandle = jLongToCKULong(jSessionHandle);
     ckKeyHandle = jLongToCKULong(jKeyHandle);
     ckpMechanism = jMechanismToCKMechanismPtr(env, jMechanism);
+    TRACE1("DEBUG C_EncryptInit: created pMech = %p\n",
+            ckpMechanism);
+
     if ((*env)->ExceptionCheck(env)) { return; }
 
     rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle, ckpMechanism,
                                         ckKeyHandle);
 
-    // if OAEP, then cannot free here
-    freeCKMechanismPtr(ckpMechanism);
+    if (ckpMechanism->mechanism == CKM_AES_GCM) {
+        if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
+            // retry with CKM_GCM_PARAMS structure in pkcs11t.h
+            TRACE0("DEBUG C_EncryptInit: retry with CK_GCM_PARAMS\n");
+            ckpTemp = updateGCMParams(env, ckpMechanism);
+            if (ckpTemp != NULL) { // only re-call if conversion succeeds
+                ckpMechanism = ckpTemp;
+                rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle, ckpMechanism,
+                        ckKeyHandle);
+            }
+        }
+    }
 
+    TRACE1("DEBUG C_EncryptInit: freed pMech = %p\n", ckpMechanism);
+    freeCKMechanismPtr(ckpMechanism);
     if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
+
+    TRACE0("FINISHED\n");
 }
 #endif
 
@@ -292,6 +310,7 @@
 {
     CK_SESSION_HANDLE ckSessionHandle;
     CK_MECHANISM_PTR ckpMechanism = NULL;
+    CK_MECHANISM_PTR ckpTemp;
     CK_OBJECT_HANDLE ckKeyHandle;
     CK_RV rv;
 
@@ -301,15 +320,32 @@
     ckSessionHandle = jLongToCKULong(jSessionHandle);
     ckKeyHandle = jLongToCKULong(jKeyHandle);
     ckpMechanism = jMechanismToCKMechanismPtr(env, jMechanism);
+    TRACE1("DEBUG C_DecryptInit: created pMech = %p\n",
+            ckpMechanism);
+
     if ((*env)->ExceptionCheck(env)) { return; }
 
     rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
                                         ckKeyHandle);
 
-    // if OAEP, then cannot free here
-    freeCKMechanismPtr(ckpMechanism);
+    if (ckpMechanism->mechanism == CKM_AES_GCM) {
+        if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
+            // retry with CKM_GCM_PARAMS structure in pkcs11t.h
+            TRACE0("DEBUG C_DecryptInit: retry with CK_GCM_PARAMS\n");
+            ckpTemp = updateGCMParams(env, ckpMechanism);
+            if (ckpTemp != NULL) { // only re-call if conversion succeeds
+                ckpMechanism = ckpTemp;
+                rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
+                        ckKeyHandle);
+            }
+        }
+    }
 
+    TRACE1("DEBUG C_DecryptInit: freed pMech = %p\n", ckpMechanism);
+    freeCKMechanismPtr(ckpMechanism);
     if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
+
+    TRACE0("FINISHED\n");
 }
 #endif
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_general.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_general.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_general.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -96,7 +96,7 @@
 (JNIEnv *env, jclass thisClass, jlong ckpMechanism) {
     if (ckpMechanism != 0L) {
         freeCKMechanismPtr(jlong_to_ptr(ckpMechanism));
-        TRACE1("DEBUG PKCS11_freeMechanism: free pMech = %x\n", ckpMechanism);
+        TRACE1("DEBUG PKCS11_freeMechanism: free pMech = %lld\n", (long long int) ckpMechanism);
     }
     return 0L;
 }
@@ -229,7 +229,10 @@
 
     free(ckpInitArgs);
 
-    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
+    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) {
+      TRACE1("DEBUG: C_Initialize had a bad return value %lu \n", (unsigned long) rv);
+      return;
+    }
 
     TRACE0("FINISHED\n");
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -223,18 +223,18 @@
     if (ckpFunctions == NULL) { return; }
 
     TRACE0("DEBUG: C_GetAttributeValue");
-    TRACE1(", hSession=%u", jSessionHandle);
-    TRACE1(", hObject=%u", jObjectHandle);
+    TRACE1(", hSession=%lld", (long long) jSessionHandle);
+    TRACE1(", hObject=%lld", (long long) jObjectHandle);
     TRACE1(", pTemplate=%p", jTemplate);
     TRACE0(" ... ");
 
     ckSessionHandle = jLongToCKULong(jSessionHandle);
     ckObjectHandle = jLongToCKULong(jObjectHandle);
-    TRACE1("jAttributeArrayToCKAttributeArray now with jTemplate = %d", jTemplate);
+    TRACE1("jAttributeArrayToCKAttributeArray now with jTemplate = %p", jTemplate);
     jAttributeArrayToCKAttributeArray(env, jTemplate, &ckpAttributes, &ckAttributesLength);
     if ((*env)->ExceptionCheck(env)) { return; }
 
-    TRACE2("DEBUG: jAttributeArrayToCKAttributeArray finished with ckpAttribute = %d, Length = %d\n", ckpAttributes, ckAttributesLength);
+    TRACE2("DEBUG: jAttributeArrayToCKAttributeArray finished with ckpAttribute = %p, Length = %lu\n", ckpAttributes, (unsigned long) ckAttributesLength);
 
     /* first set all pValue to NULL, to get the needed buffer length */
     for(i = 0; i < ckAttributesLength; i++) {
@@ -345,7 +345,7 @@
     if (ckpFunctions == NULL) { return; }
 
     TRACE0("DEBUG: C_FindObjectsInit");
-    TRACE1(", hSession=%u", jSessionHandle);
+    TRACE1(", hSession=%lld", (long long int) jSessionHandle);
     TRACE1(", pTemplate=%p", jTemplate);
     TRACE0(" ... ");
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -117,8 +117,8 @@
 #endif /* NO_CALLBACKS */
 
     TRACE0("DEBUG: C_OpenSession");
-    TRACE1(", slotID=%u", ckSlotID);
-    TRACE1(", flags=%x", ckFlags);
+    TRACE1(", slotID=%lu", ckSlotID);
+    TRACE1(", flags=%lu", (unsigned long) ckFlags);
     TRACE0(" ... ");
 
     rv = (*ckpFunctions->C_OpenSession)(ckSlotID, ckFlags, ckpApplication, ckNotify, &ckSessionHandle);
@@ -136,7 +136,7 @@
     }
 
     TRACE0("got session");
-    TRACE1(", SessionHandle=%u", ckSessionHandle);
+    TRACE1(", SessionHandle=%lu", (unsigned long) ckSessionHandle);
     TRACE0(" ... ");
 
     jSessionHandle = ckULongToJLong(ckSessionHandle);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_util.c openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_util.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/p11_util.c	2021-09-01 14:33:15.000000000 +0000
@@ -302,29 +302,30 @@
      CK_TLS12_KEY_MAT_PARAMS* tlsKmTmp;
 
      if (mechPtr != NULL) {
-         TRACE2("DEBUG: free mech %lX (mech id = 0x%lX)\n",
-                 ptr_to_jlong(mechPtr),  mechPtr->mechanism);
+         TRACE2("DEBUG freeCKMechanismPtr: free pMech %p (mech 0x%lX)\n",
+                 mechPtr,  mechPtr->mechanism);
          if (mechPtr->pParameter != NULL) {
+             tmp = mechPtr->pParameter;
              switch (mechPtr->mechanism) {
                  case CKM_AES_GCM:
-                     tmp = mechPtr->pParameter;
-                     TRACE1("\t=> free GCM_PARAMS %lX\n",
-                             ptr_to_jlong(tmp));
-                     free(((CK_GCM_PARAMS*)tmp)->pIv);
-                     free(((CK_GCM_PARAMS*)tmp)->pAAD);
+                     if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS_NO_IVBITS)) {
+                         TRACE0("[ GCM_PARAMS w/o ulIvBits ]\n");
+                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pIv);
+                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pAAD);
+                     } else if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS)) {
+                         TRACE0("[ GCM_PARAMS ]\n");
+                         free(((CK_GCM_PARAMS*)tmp)->pIv);
+                         free(((CK_GCM_PARAMS*)tmp)->pAAD);
+                     }
                      break;
                  case CKM_AES_CCM:
-                     tmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_CCM_PARAMS %lX\n",
-                             ptr_to_jlong(tmp));
+                     TRACE0("[ CK_CCM_PARAMS ]\n");
                      free(((CK_CCM_PARAMS*)tmp)->pNonce);
                      free(((CK_CCM_PARAMS*)tmp)->pAAD);
                      break;
                  case CKM_TLS_PRF:
                  case CKM_NSS_TLS_PRF_GENERAL:
-                     tmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_TLS_PRF_PARAMS %lX\n",
-                         ptr_to_jlong(tmp));
+                     TRACE0("[ CK_TLS_PRF_PARAMS ]\n");
                      free(((CK_TLS_PRF_PARAMS*)tmp)->pSeed);
                      free(((CK_TLS_PRF_PARAMS*)tmp)->pLabel);
                      free(((CK_TLS_PRF_PARAMS*)tmp)->pulOutputLen);
@@ -334,18 +335,16 @@
                  case CKM_TLS_MASTER_KEY_DERIVE:
                  case CKM_SSL3_MASTER_KEY_DERIVE_DH:
                  case CKM_TLS_MASTER_KEY_DERIVE_DH:
-                     sslMkdTmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_SSL3_MASTER_KEY_DERIVE_PARAMS %lX\n",
-                         ptr_to_jlong(sslMkdTmp));
+                     sslMkdTmp = tmp;
+                     TRACE0("[ CK_SSL3_MASTER_KEY_DERIVE_PARAMS ]\n");
                      free(sslMkdTmp->RandomInfo.pClientRandom);
                      free(sslMkdTmp->RandomInfo.pServerRandom);
                      free(sslMkdTmp->pVersion);
                      break;
                  case CKM_SSL3_KEY_AND_MAC_DERIVE:
                  case CKM_TLS_KEY_AND_MAC_DERIVE:
-                     sslKmTmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_SSL3_KEY_MAT_PARAMS %lX\n",
-                         ptr_to_jlong(sslKmTmp));
+                     sslKmTmp = tmp;
+                     TRACE0("[ CK_SSL3_KEY_MAT_PARAMS ]\n");
                      free(sslKmTmp->RandomInfo.pClientRandom);
                      free(sslKmTmp->RandomInfo.pServerRandom);
                      if (sslKmTmp->pReturnedKeyMaterial != NULL) {
@@ -356,17 +355,15 @@
                      break;
                  case CKM_TLS12_MASTER_KEY_DERIVE:
                  case CKM_TLS12_MASTER_KEY_DERIVE_DH:
-                     tlsMkdTmp = mechPtr->pParameter;
-                     TRACE1("\t=> CK_TLS12_MASTER_KEY_DERIVE_PARAMS %lX\n",
-                         ptr_to_jlong(tlsMkdTmp));
+                     tlsMkdTmp = tmp;
+                     TRACE0("[ CK_TLS12_MASTER_KEY_DERIVE_PARAMS ]\n");
                      free(tlsMkdTmp->RandomInfo.pClientRandom);
                      free(tlsMkdTmp->RandomInfo.pServerRandom);
                      free(tlsMkdTmp->pVersion);
                      break;
                  case CKM_TLS12_KEY_AND_MAC_DERIVE:
-                     tlsKmTmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_TLS12_KEY_MAT_PARAMS %lX\n",
-                         ptr_to_jlong(tlsKmTmp));
+                     tlsKmTmp = tmp;
+                     TRACE0("[ CK_TLS12_KEY_MAT_PARAMS ]\n");
                      free(tlsKmTmp->RandomInfo.pClientRandom);
                      free(tlsKmTmp->RandomInfo.pServerRandom);
                      if (tlsKmTmp->pReturnedKeyMaterial != NULL) {
@@ -377,9 +374,7 @@
                      break;
                  case CKM_ECDH1_DERIVE:
                  case CKM_ECDH1_COFACTOR_DERIVE:
-                     tmp = mechPtr->pParameter;
-                     TRACE1("\t=> free CK_ECDH1_DERIVE_PARAMS %lX\n",
-                         ptr_to_jlong(tmp));
+                     TRACE0("[ CK_ECDH1_DERIVE_PARAMS ]\n");
                      free(((CK_ECDH1_DERIVE_PARAMS *)tmp)->pSharedData);
                      free(((CK_ECDH1_DERIVE_PARAMS *)tmp)->pPublicData);
                      break;
@@ -387,7 +382,6 @@
                  case CKM_AES_CTR:
                  case CKM_RSA_PKCS_PSS:
                  case CKM_CAMELLIA_CTR:
-                     TRACE0("\t=> NO OP\n");
                      // params do not contain pointers
                      break;
                  default:
@@ -399,17 +393,59 @@
                      // CKM_EXTRACT_KEY_FROM_KEY, CKM_OTP, CKM_KIP,
                      // CKM_DSA_PARAMETER_GEN?, CKM_GOSTR3410_*
                      // CK_any_CBC_ENCRYPT_DATA?
-                     TRACE0("\t=> ERROR UNSUPPORTED CK PARAMS\n");
+                     TRACE0("ERROR: UNSUPPORTED CK_MECHANISM\n");
                      break;
              }
-             free(mechPtr->pParameter);
+             TRACE1("\t=> freed param %p\n", tmp);
+             free(tmp);
          } else {
-             TRACE0("DEBUG => Parameter NULL\n");
+             TRACE0("\t=> param NULL\n");
          }
          free(mechPtr);
+         TRACE0("FINISHED\n");
      }
 }
 
+/* This function replaces the CK_GCM_PARAMS_NO_IVBITS structure associated
+ * with the specified CK_MECHANISM structure with CK_GCM_PARAMS
+ * structure.
+ *
+ * @param mechPtr pointer to the CK_MECHANISM structure containing
+ * the to-be-converted CK_GCM_PARAMS_NO_IVBITS structure.
+ * @return pointer to the CK_MECHANISM structure containing the
+ * converted CK_GCM_PARAMS structure or NULL if no conversion took place.
+ */
+CK_MECHANISM_PTR updateGCMParams(JNIEnv *env, CK_MECHANISM_PTR mechPtr) {
+    CK_GCM_PARAMS* pGcmParams2 = NULL;
+    CK_GCM_PARAMS_NO_IVBITS* pParams = NULL;
+    if ((mechPtr->mechanism == CKM_AES_GCM) &&
+            (mechPtr->pParameter != NULL_PTR) &&
+            (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS_NO_IVBITS))) {
+        pGcmParams2 = calloc(1, sizeof(CK_GCM_PARAMS));
+        if (pGcmParams2 == NULL) {
+            throwOutOfMemoryError(env, 0);
+            return NULL;
+        }
+        pParams = (CK_GCM_PARAMS_NO_IVBITS*) mechPtr->pParameter;
+        pGcmParams2->pIv = pParams->pIv;
+        pGcmParams2->ulIvLen = pParams->ulIvLen;
+        pGcmParams2->ulIvBits = (pGcmParams2->ulIvLen << 3);
+        pGcmParams2->pAAD = pParams->pAAD;
+        pGcmParams2->ulAADLen = pParams->ulAADLen;
+        pGcmParams2->ulTagBits = pParams->ulTagBits;
+        TRACE1("DEBUG updateGCMParams: pMech %p\n", mechPtr);
+        TRACE2("\t=> GCM param w/o ulIvBits %p => GCM param %p\n", pParams,
+                pGcmParams2);
+        free(pParams);
+        mechPtr->pParameter = pGcmParams2;
+        mechPtr->ulParameterLen = sizeof(CK_GCM_PARAMS);
+        return mechPtr;
+    } else {
+        TRACE0("DEBUG updateGCMParams: no conversion done\n");
+    }
+    return NULL;
+}
+
 /*
  * the following functions convert Java arrays to PKCS#11 array pointers and
  * their array length and vice versa
@@ -719,16 +755,15 @@
         throwOutOfMemoryError(env, 0);
         return;
     }
-    TRACE1(", converting %d attributes", jLength);
+    TRACE1(", converting %lld attributes", (long long int) jLength);
     for (i=0; i<(*ckpLength); i++) {
-        TRACE1(", getting %d. attribute", i);
+        TRACE1(", getting %lu. attribute", i);
         jAttribute = (*env)->GetObjectArrayElement(env, jArray, i);
         if ((*env)->ExceptionCheck(env)) {
             freeCKAttributeArray(*ckpArray, i);
             return;
         }
-        TRACE1(", jAttribute = %d", jAttribute);
-        TRACE1(", converting %d. attribute", i);
+        TRACE1(", jAttribute , converting %lu. attribute", i);
         (*ckpArray)[i] = jAttributeToCKAttribute(env, jAttribute);
         if ((*env)->ExceptionCheck(env)) {
             freeCKAttributeArray(*ckpArray, i);
@@ -1116,7 +1151,7 @@
     if ((*env)->IsInstanceOf(env, jObject, jLongClass)) {
         ckpObject = jLongObjectToCKULongPtr(env, jObject);
         *ckpLength = sizeof(CK_ULONG);
-        TRACE1("<converted long value %X>", *((CK_ULONG *) ckpObject));
+        TRACE1("<converted long value %lu>", *((CK_ULONG *) ckpObject));
         return ckpObject;
     }
 
@@ -1126,7 +1161,7 @@
         ckpObject = jBooleanObjectToCKBBoolPtr(env, jObject);
         *ckpLength = sizeof(CK_BBOOL);
         TRACE0(" <converted boolean value ");
-        TRACE0((*((CK_BBOOL *) ckpObjectPtr) == TRUE) ? "TRUE>" : "FALSE>");
+        TRACE0((*((CK_BBOOL *) ckpObject) == TRUE) ? "TRUE>" : "FALSE>");
         return ckpObject;
     }
 
@@ -1177,7 +1212,7 @@
     if ((*env)->IsInstanceOf(env, jObject, jIntegerClass)) {
         ckpObject = jIntegerObjectToCKULongPtr(env, jObject);
         *ckpLength = sizeof(CK_ULONG);
-        TRACE1("<converted integer value %X>", *((CK_ULONG *) ckpObject));
+        TRACE1("<converted integer value %lu>", *((CK_ULONG *) ckpObject));
         return ckpObject;
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) OASIS Open 2016. All Rights Reserved./
+/* Copyright (c) OASIS Open 2016, 2019. All Rights Reserved./
  * /Distributed under the terms of the OASIS IPR Policy,
  * [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
  * IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A
@@ -937,3 +937,261 @@
 );
 #endif
 
+#ifndef CK_PKCS11_2_0_ONLY
+/* C_GetInterfaceList returns all the interfaces supported by the module*/
+CK_PKCS11_FUNCTION_INFO(C_GetInterfaceList)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_INTERFACE_PTR  pInterfacesList,  /* returned interfaces */
+  CK_ULONG_PTR      pulCount          /* number of interfaces returned */
+);
+#endif
+
+/* C_GetInterface returns a specific interface from the module. */
+CK_PKCS11_FUNCTION_INFO(C_GetInterface)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_UTF8CHAR_PTR       pInterfaceName, /* name of the interface */
+  CK_VERSION_PTR        pVersion,       /* version of the interface */
+  CK_INTERFACE_PTR_PTR  ppInterface,    /* returned interface */
+  CK_FLAGS              flags           /* flags controlling the semantics
+                                         * of the interface */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_LoginUser)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,  /* the session's handle */
+  CK_USER_TYPE      userType,  /* the user type */
+  CK_UTF8CHAR_PTR   pPin,      /* the user's PIN */
+  CK_ULONG          ulPinLen,  /* the length of the PIN */
+  CK_UTF8CHAR_PTR   pUsername, /* the user's name */
+  CK_ULONG          ulUsernameLen /*the length of the user's name */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_SessionCancel)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,  /* the session's handle */
+  CK_FLAGS          flags      /* flags control which sessions are cancelled */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageEncryptInit)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,    /* the session's handle */
+  CK_MECHANISM_PTR  pMechanism,  /* the encryption mechanism */
+  CK_OBJECT_HANDLE  hKey         /* handle of encryption key */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_EncryptMessage)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pAssociatedData,  /* AEAD Associated data */
+  CK_ULONG ulAssociatedDataLen, /* AEAD Associated data length */
+  CK_BYTE_PTR pPlaintext,       /* plain text  */
+  CK_ULONG ulPlaintextLen,      /* plain text length */
+  CK_BYTE_PTR pCiphertext,      /* gets cipher text */
+  CK_ULONG_PTR pulCiphertextLen /* gets cipher text length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_EncryptMessageBegin)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pAssociatedData,  /* AEAD Associated data */
+  CK_ULONG ulAssociatedDataLen  /* AEAD Associated data length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_EncryptMessageNext)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,        /* the session's handle */
+  CK_VOID_PTR pParameter,            /* message specific parameter */
+  CK_ULONG ulParameterLen,           /* length of message specific parameter */
+  CK_BYTE_PTR pPlaintextPart,        /* plain text */
+  CK_ULONG ulPlaintextPartLen,       /* plain text length */
+  CK_BYTE_PTR pCiphertextPart,       /* gets cipher text */
+  CK_ULONG_PTR pulCiphertextPartLen, /* gets cipher text length */
+  CK_FLAGS flags                     /* multi mode flag */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageEncryptFinal)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession        /* the session's handle */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageDecryptInit)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,    /* the session's handle */
+  CK_MECHANISM_PTR  pMechanism,  /* the decryption mechanism */
+  CK_OBJECT_HANDLE  hKey         /* handle of decryption key */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_DecryptMessage)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pAssociatedData,  /* AEAD Associated data */
+  CK_ULONG ulAssociatedDataLen, /* AEAD Associated data length */
+  CK_BYTE_PTR pCiphertext,      /* cipher text */
+  CK_ULONG ulCiphertextLen,     /* cipher text length */
+  CK_BYTE_PTR pPlaintext,       /* gets plain text */
+  CK_ULONG_PTR pulPlaintextLen  /* gets plain text length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_DecryptMessageBegin)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pAssociatedData,  /* AEAD Associated data */
+  CK_ULONG ulAssociatedDataLen  /* AEAD Associated data length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_DecryptMessageNext)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,        /* the session's handle */
+  CK_VOID_PTR pParameter,            /* message specific parameter */
+  CK_ULONG ulParameterLen,           /* length of message specific parameter */
+  CK_BYTE_PTR pCiphertextPart,       /* cipher text */
+  CK_ULONG ulCiphertextPartLen,      /* cipher text length */
+  CK_BYTE_PTR pPlaintextPart,        /* gets plain text */
+  CK_ULONG_PTR pulPlaintextPartLen,  /* gets plain text length */
+  CK_FLAGS flags                     /* multi mode flag */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageDecryptFinal)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession        /* the session's handle */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageSignInit)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,    /* the session's handle */
+  CK_MECHANISM_PTR  pMechanism,  /* the signing mechanism */
+  CK_OBJECT_HANDLE  hKey         /* handle of signing key */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_SignMessage)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pData,            /* data to sign */
+  CK_ULONG ulDataLen,           /* data to sign length */
+  CK_BYTE_PTR pSignature,       /* gets signature */
+  CK_ULONG_PTR pulSignatureLen  /* gets signature length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_SignMessageBegin)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen      /* length of message specific parameter */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_SignMessageNext)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pData,            /* data to sign */
+  CK_ULONG ulDataLen,           /* data to sign length */
+  CK_BYTE_PTR pSignature,       /* gets signature */
+  CK_ULONG_PTR pulSignatureLen  /* gets signature length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageSignFinal)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession        /* the session's handle */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageVerifyInit)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,    /* the session's handle */
+  CK_MECHANISM_PTR  pMechanism,  /* the signing mechanism */
+  CK_OBJECT_HANDLE  hKey         /* handle of signing key */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_VerifyMessage)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pData,            /* data to sign */
+  CK_ULONG ulDataLen,           /* data to sign length */
+  CK_BYTE_PTR pSignature,       /* signature */
+  CK_ULONG ulSignatureLen       /* signature length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_VerifyMessageBegin)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen      /* length of message specific parameter */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_VerifyMessageNext)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession,   /* the session's handle */
+  CK_VOID_PTR pParameter,       /* message specific parameter */
+  CK_ULONG ulParameterLen,      /* length of message specific parameter */
+  CK_BYTE_PTR pData,            /* data to sign */
+  CK_ULONG ulDataLen,           /* data to sign length */
+  CK_BYTE_PTR pSignature,       /* signature */
+  CK_ULONG ulSignatureLen       /* signature length */
+);
+#endif
+
+CK_PKCS11_FUNCTION_INFO(C_MessageVerifyFinal)
+#ifdef CK_NEED_ARG_LIST
+(
+  CK_SESSION_HANDLE hSession        /* the session's handle */
+);
+#endif
+
+#endif /* CK_PKCS11_2_0_ONLY */
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11gcm2.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11gcm2.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11gcm2.h	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11gcm2.h	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* There is a known incompatibility for CK_GCM_PARAMS structure.
+ * PKCS#11 v2.40 standard mechanisms specification specifies
+ * CK_GCM_PARAMS as
+ *     typedef struct CK_GCM_PARAMS {
+ *         CK_BYTE_PTR       pIv;
+ *         CK_ULONG          ulIvLen;
+ *         CK_BYTE_PTR       pAAD;
+ *         CK_ULONG          ulAADLen;
+ *         CK_ULONG          ulTagBits;
+ *     } CK_GCM_PARAMS;
+ * However, the official header file of PKCS#11 v2.40 defines the
+ * CK_GCM_PARAMS with an extra "ulIvBits" field (type CK_ULONG).
+ * NSS uses the spec version while Solaris and SoftHSM2 use the header
+ * version. In order to work with both sides, SunPKCS11 provider defines
+ * the spec version of CK_GCM_PARAMS as CK_GCM_PARAMS_NO_IVBITS (as in this
+ * file) and uses it first before failing over to the header version.
+ */
+#ifndef _PKCS11GCM2_H_
+#define _PKCS11GCM2_H_ 1
+
+/* include the platform dependent part of the header */
+typedef struct CK_GCM_PARAMS_NO_IVBITS {
+    CK_BYTE_PTR       pIv;
+    CK_ULONG          ulIvLen;
+    CK_BYTE_PTR       pAAD;
+    CK_ULONG          ulAADLen;
+    CK_ULONG          ulTagBits;
+} CK_GCM_PARAMS_NO_IVBITS;
+
+typedef CK_GCM_PARAMS_NO_IVBITS CK_PTR CK_GCM_PARAMS_NO_IVBITS_PTR;
+
+#endif /* _PKCS11GCM2_H_ */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,14 +1,10 @@
-/* Copyright (c) OASIS Open 2016. All Rights Reserved./
- * /Distributed under the terms of the OASIS IPR Policy,
+/* Copyright (c) OASIS Open 2016-2019. All Rights Reserved.
+ * Distributed under the terms of the OASIS IPR Policy,
  * [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
  * IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A
  * PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
  */
 
-/* Latest version of the specification:
- * http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
- */
-
 #ifndef _PKCS11_H_
 #define _PKCS11_H_ 1
 
@@ -29,8 +25,7 @@
  * convention on packing is that structures should be 1-byte
  * aligned.
  *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, this might be done by using the following
+ * If you're using Windows this might be done by using the following
  * preprocessor directive before including pkcs11.h or pkcs11t.h:
  *
  * #pragma pack(push, cryptoki, 1)
@@ -40,13 +35,6 @@
  *
  * #pragma pack(pop, cryptoki)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, this might be done by using
- * the following preprocessor directive before including
- * pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(1)
- *
  * In a UNIX environment, you're on your own for this.  You might
  * not need to do (or be able to do!) anything.
  *
@@ -59,16 +47,10 @@
  *
  * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
  *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, it might be defined by:
+ * If you're using windows, it might be defined by:
  *
  * #define CK_PTR *
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, it might be defined by:
- *
- * #define CK_PTR far *
- *
  * In a typical UNIX environment, it might be defined by:
  *
  * #define CK_PTR *
@@ -83,19 +65,12 @@
  *   CK_VOID_PTR pReserved
  * );
  *
- * If you're using Microsoft Developer Studio 5.0 to declare a
- * function in a Win32 Cryptoki .dll, it might be defined by:
+ * If you're using Windows to declare a function in a Win32 cryptoki .dll,
+ * it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION(returnType, name) \
  *   returnType __declspec(dllimport) name
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to declare a function in a Win16 Cryptoki .dll, it
- * might be defined by:
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __export _far _pascal name
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION(returnType, name) \
@@ -120,19 +95,12 @@
  * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
  * funcPtrType funcPtr;
  *
- * If you're using Microsoft Developer Studio 5.0 to access
+ * If you're using Windows to access
  * functions in a Win32 Cryptoki .dll, in might be defined by:
  *
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
  *   returnType __declspec(dllimport) (* name)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to access functions in a Win16 Cryptoki .dll, it might
- * be defined by:
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __export _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
@@ -153,18 +121,11 @@
  * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
  * myCallbackType myCallback;
  *
- * If you're using Microsoft Developer Studio 5.0 to do Win32
- * Cryptoki development, it might be defined by:
+ * If you're using Windows, it might be defined by:
  *
  * #define CK_CALLBACK_FUNCTION(returnType, name) \
  *   returnType (* name)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to do Win16 development, it might be defined by:
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_CALLBACK_FUNCTION(returnType, name) \
@@ -240,6 +201,22 @@
 #define CK_PKCS11_FUNCTION_INFO(name) \
   __PASTE(CK_,name) name;
 
+/* Create the 3.0 Function list */
+struct CK_FUNCTION_LIST_3_0 {
+
+  CK_VERSION    version;  /* Cryptoki version */
+
+/* Pile all the function pointers into the CK_FUNCTION_LIST. */
+/* pkcs11f.h has all the information about the Cryptoki
+ * function prototypes.
+ */
+#include "pkcs11f.h"
+
+};
+
+#define CK_PKCS11_2_0_ONLY 1
+
+/* Continue to define the old CK_FUNCTION_LIST */
 struct CK_FUNCTION_LIST {
 
   CK_VERSION    version;  /* Cryptoki version */
@@ -253,6 +230,7 @@
 };
 
 #undef CK_PKCS11_FUNCTION_INFO
+#undef CK_PKCS11_2_0_ONLY
 
 
 #undef __PASTE
@@ -263,3 +241,4 @@
 
 #endif /* _PKCS11_H_ */
 
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) OASIS Open 2016. All Rights Reserved./
+/* Copyright (c) OASIS Open 2016, 2019. All Rights Reserved./
  * /Distributed under the terms of the OASIS IPR Policy,
  * [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
  * IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A
@@ -17,8 +17,8 @@
 #ifndef _PKCS11T_H_
 #define _PKCS11T_H_ 1
 
-#define CRYPTOKI_VERSION_MAJOR          2
-#define CRYPTOKI_VERSION_MINOR          40
+#define CRYPTOKI_VERSION_MAJOR          3
+#define CRYPTOKI_VERSION_MINOR          0
 #define CRYPTOKI_VERSION_AMENDMENT      0
 
 #define CK_TRUE         1
@@ -77,19 +77,19 @@
 
 
 typedef struct CK_VERSION {
-  CK_BYTE       major;  /* integer portion of version number */
-  CK_BYTE       minor;  /* 1/100ths portion of version number */
+    CK_BYTE major;  /* integer portion of version number */
+    CK_BYTE minor;  /* 1/100ths portion of version number */
 } CK_VERSION;
 
 typedef CK_VERSION CK_PTR CK_VERSION_PTR;
 
 
 typedef struct CK_INFO {
-  CK_VERSION    cryptokiVersion;     /* Cryptoki interface ver */
-  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
-  CK_FLAGS      flags;               /* must be zero */
-  CK_UTF8CHAR   libraryDescription[32];  /* blank padded */
-  CK_VERSION    libraryVersion;          /* version of library */
+    CK_VERSION  cryptokiVersion;        /* Cryptoki interface ver */
+    CK_UTF8CHAR manufacturerID[32];     /* blank padded */
+    CK_FLAGS    flags;                  /* must be zero */
+    CK_UTF8CHAR libraryDescription[32]; /* blank padded */
+    CK_VERSION  libraryVersion;         /* version of library */
 } CK_INFO;
 
 typedef CK_INFO CK_PTR    CK_INFO_PTR;
@@ -109,12 +109,12 @@
 
 /* CK_SLOT_INFO provides information about a slot */
 typedef struct CK_SLOT_INFO {
-  CK_UTF8CHAR   slotDescription[64];  /* blank padded */
-  CK_UTF8CHAR   manufacturerID[32];   /* blank padded */
-  CK_FLAGS      flags;
+    CK_UTF8CHAR slotDescription[64];  /* blank padded */
+    CK_UTF8CHAR manufacturerID[32];   /* blank padded */
+    CK_FLAGS    flags;
 
-  CK_VERSION    hardwareVersion;  /* version of hardware */
-  CK_VERSION    firmwareVersion;  /* version of firmware */
+    CK_VERSION  hardwareVersion;      /* version of hardware */
+    CK_VERSION  firmwareVersion;      /* version of firmware */
 } CK_SLOT_INFO;
 
 /* flags: bit flags that provide capabilities of the slot
@@ -129,25 +129,25 @@
 
 /* CK_TOKEN_INFO provides information about a token */
 typedef struct CK_TOKEN_INFO {
-  CK_UTF8CHAR   label[32];           /* blank padded */
-  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
-  CK_UTF8CHAR   model[16];           /* blank padded */
-  CK_CHAR       serialNumber[16];    /* blank padded */
-  CK_FLAGS      flags;               /* see below */
-
-  CK_ULONG      ulMaxSessionCount;     /* max open sessions */
-  CK_ULONG      ulSessionCount;        /* sess. now open */
-  CK_ULONG      ulMaxRwSessionCount;   /* max R/W sessions */
-  CK_ULONG      ulRwSessionCount;      /* R/W sess. now open */
-  CK_ULONG      ulMaxPinLen;           /* in bytes */
-  CK_ULONG      ulMinPinLen;           /* in bytes */
-  CK_ULONG      ulTotalPublicMemory;   /* in bytes */
-  CK_ULONG      ulFreePublicMemory;    /* in bytes */
-  CK_ULONG      ulTotalPrivateMemory;  /* in bytes */
-  CK_ULONG      ulFreePrivateMemory;   /* in bytes */
-  CK_VERSION    hardwareVersion;       /* version of hardware */
-  CK_VERSION    firmwareVersion;       /* version of firmware */
-  CK_CHAR       utcTime[16];           /* time */
+    CK_UTF8CHAR label[32];            /* blank padded */
+    CK_UTF8CHAR manufacturerID[32];   /* blank padded */
+    CK_UTF8CHAR model[16];            /* blank padded */
+    CK_CHAR     serialNumber[16];     /* blank padded */
+    CK_FLAGS    flags;                /* see below */
+
+    CK_ULONG    ulMaxSessionCount;    /* max open sessions */
+    CK_ULONG    ulSessionCount;       /* sess. now open */
+    CK_ULONG    ulMaxRwSessionCount;  /* max R/W sessions */
+    CK_ULONG    ulRwSessionCount;     /* R/W sess. now open */
+    CK_ULONG    ulMaxPinLen;          /* in bytes */
+    CK_ULONG    ulMinPinLen;          /* in bytes */
+    CK_ULONG    ulTotalPublicMemory;  /* in bytes */
+    CK_ULONG    ulFreePublicMemory;   /* in bytes */
+    CK_ULONG    ulTotalPrivateMemory; /* in bytes */
+    CK_ULONG    ulFreePrivateMemory;  /* in bytes */
+    CK_VERSION  hardwareVersion;      /* version of hardware */
+    CK_VERSION  firmwareVersion;      /* version of firmware */
+    CK_CHAR     utcTime[16];          /* time */
 } CK_TOKEN_INFO;
 
 /* The flags parameter is defined as follows:
@@ -278,10 +278,10 @@
 
 /* CK_SESSION_INFO provides information about a session */
 typedef struct CK_SESSION_INFO {
-  CK_SLOT_ID    slotID;
-  CK_STATE      state;
-  CK_FLAGS      flags;          /* see below */
-  CK_ULONG      ulDeviceError;  /* device-dependent error code */
+    CK_SLOT_ID slotID;
+    CK_STATE   state;
+    CK_FLAGS   flags;          /* see below */
+    CK_ULONG   ulDeviceError;  /* device-dependent error code */
 } CK_SESSION_INFO;
 
 /* The flags are defined in the following table:
@@ -317,11 +317,20 @@
 #define CKO_DOMAIN_PARAMETERS 0x00000006UL
 #define CKO_MECHANISM         0x00000007UL
 #define CKO_OTP_KEY           0x00000008UL
+#define CKO_PROFILE           0x00000009UL
 
 #define CKO_VENDOR_DEFINED    0x80000000UL
 
 typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
 
+/* Profile ID's */
+#define CKP_INVALID_ID                0x00000000UL
+#define CKP_BASELINE_PROVIDER         0x00000001UL
+#define CKP_EXTENDED_PROVIDER         0x00000002UL
+#define CKP_AUTHENTICATION_TOKEN      0x00000003UL
+#define CKP_PUBLIC_CERTIFICATES_TOKEN 0x00000004UL
+#define CKP_VENDOR_DEFINED            0x80000000UL
+
 /* CK_HW_FEATURE_TYPE is a value that identifies the hardware feature type
  * of an object with CK_OBJECT_CLASS equal to CKO_HW_FEATURE.
  */
@@ -369,6 +378,8 @@
 #define CKK_CAMELLIA            0x00000025UL
 #define CKK_ARIA                0x00000026UL
 
+/* the following definitions were added in the 2.30 header file,
+ * but never defined in the spec. */
 #define CKK_MD5_HMAC            0x00000027UL
 #define CKK_SHA_1_HMAC          0x00000028UL
 #define CKK_RIPEMD128_HMAC      0x00000029UL
@@ -382,8 +393,25 @@
 #define CKK_GOSTR3410           0x00000030UL
 #define CKK_GOSTR3411           0x00000031UL
 #define CKK_GOST28147           0x00000032UL
-
-
+#define CKK_CHACHA20            0x00000033UL
+#define CKK_POLY1305            0x00000034UL
+#define CKK_AES_XTS             0x00000035UL
+#define CKK_SHA3_224_HMAC       0x00000036UL
+#define CKK_SHA3_256_HMAC       0x00000037UL
+#define CKK_SHA3_384_HMAC       0x00000038UL
+#define CKK_SHA3_512_HMAC       0x00000039UL
+#define CKK_BLAKE2B_160_HMAC    0x0000003aUL
+#define CKK_BLAKE2B_256_HMAC    0x0000003bUL
+#define CKK_BLAKE2B_384_HMAC    0x0000003cUL
+#define CKK_BLAKE2B_512_HMAC    0x0000003dUL
+#define CKK_SALSA20             0x0000003eUL
+#define CKK_X2RATCHET           0x0000003fUL
+#define CKK_EC_EDWARDS          0x00000040UL
+#define CKK_EC_MONTGOMERY       0x00000041UL
+#define CKK_HKDF                0x00000042UL
+#define CKK_SHA512_224_HMAC     0x00000043UL
+#define CKK_SHA512_256_HMAC     0x00000044UL
+#define CKK_SHA512_T_HMAC       0x00000045UL
 
 #define CKK_VENDOR_DEFINED      0x80000000UL
 
@@ -439,6 +467,7 @@
 #define CKA_TOKEN              0x00000001UL
 #define CKA_PRIVATE            0x00000002UL
 #define CKA_LABEL              0x00000003UL
+#define CKA_UNIQUE_ID          0x00000004UL
 #define CKA_APPLICATION        0x00000010UL
 #define CKA_VALUE              0x00000011UL
 #define CKA_OBJECT_ID          0x00000012UL
@@ -556,6 +585,24 @@
 #define CKA_DEFAULT_CMS_ATTRIBUTES      0x00000502UL
 #define CKA_SUPPORTED_CMS_ATTRIBUTES    0x00000503UL
 #define CKA_ALLOWED_MECHANISMS          (CKF_ARRAY_ATTRIBUTE|0x00000600UL)
+#define CKA_PROFILE_ID                  0x00000601UL
+#define CKA_X2RATCHET_BAG               0x00000602UL
+#define CKA_X2RATCHET_BAGSIZE           0x00000603UL
+#define CKA_X2RATCHET_BOBS1STMSG        0x00000604UL
+#define CKA_X2RATCHET_CKR               0x00000605UL
+#define CKA_X2RATCHET_CKS               0x00000606UL
+#define CKA_X2RATCHET_DHP               0x00000607UL
+#define CKA_X2RATCHET_DHR               0x00000608UL
+#define CKA_X2RATCHET_DHS               0x00000609UL
+#define CKA_X2RATCHET_HKR               0x0000060aUL
+#define CKA_X2RATCHET_HKS               0x0000060bUL
+#define CKA_X2RATCHET_ISALICE           0x0000060cUL
+#define CKA_X2RATCHET_NHKR              0x0000060dUL
+#define CKA_X2RATCHET_NHKS              0x0000060eUL
+#define CKA_X2RATCHET_NR                0x0000060fUL
+#define CKA_X2RATCHET_NS                0x00000610UL
+#define CKA_X2RATCHET_PNS               0x00000611UL
+#define CKA_X2RATCHET_RK                0x00000612UL
 
 #define CKA_VENDOR_DEFINED              0x80000000UL
 
@@ -563,18 +610,18 @@
  * and value of an attribute
  */
 typedef struct CK_ATTRIBUTE {
-  CK_ATTRIBUTE_TYPE type;
-  CK_VOID_PTR       pValue;
-  CK_ULONG          ulValueLen;  /* in bytes */
+    CK_ATTRIBUTE_TYPE type;
+    CK_VOID_PTR       pValue;
+    CK_ULONG          ulValueLen;  /* in bytes */
 } CK_ATTRIBUTE;
 
 typedef CK_ATTRIBUTE CK_PTR CK_ATTRIBUTE_PTR;
 
 /* CK_DATE is a structure that defines a date */
 typedef struct CK_DATE{
-  CK_CHAR       year[4];   /* the year ("1900" - "9999") */
-  CK_CHAR       month[2];  /* the month ("01" - "12") */
-  CK_CHAR       day[2];    /* the day   ("01" - "31") */
+    CK_CHAR year[4];   /* the year ("1900" - "9999") */
+    CK_CHAR month[2];  /* the month ("01" - "12") */
+    CK_CHAR day[2];    /* the day   ("01" - "31") */
 } CK_DATE;
 
 
@@ -610,6 +657,10 @@
 #define CKM_DSA_SHA256                 0x00000014UL
 #define CKM_DSA_SHA384                 0x00000015UL
 #define CKM_DSA_SHA512                 0x00000016UL
+#define CKM_DSA_SHA3_224               0x00000018UL
+#define CKM_DSA_SHA3_256               0x00000019UL
+#define CKM_DSA_SHA3_384               0x0000001AUL
+#define CKM_DSA_SHA3_512               0x0000001BUL
 
 #define CKM_DH_PKCS_KEY_PAIR_GEN       0x00000020UL
 #define CKM_DH_PKCS_DERIVE             0x00000021UL
@@ -643,6 +694,15 @@
 #define CKM_SHA512_T_HMAC_GENERAL      0x00000052UL
 #define CKM_SHA512_T_KEY_DERIVATION    0x00000053UL
 
+#define CKM_SHA3_256_RSA_PKCS          0x00000060UL
+#define CKM_SHA3_384_RSA_PKCS          0x00000061UL
+#define CKM_SHA3_512_RSA_PKCS          0x00000062UL
+#define CKM_SHA3_256_RSA_PKCS_PSS      0x00000063UL
+#define CKM_SHA3_384_RSA_PKCS_PSS      0x00000064UL
+#define CKM_SHA3_512_RSA_PKCS_PSS      0x00000065UL
+#define CKM_SHA3_224_RSA_PKCS          0x00000066UL
+#define CKM_SHA3_224_RSA_PKCS_PSS      0x00000067UL
+
 #define CKM_RC2_KEY_GEN                0x00000100UL
 #define CKM_RC2_ECB                    0x00000101UL
 #define CKM_RC2_CBC                    0x00000102UL
@@ -724,6 +784,24 @@
 #define CKM_ACTI                       0x000002A0UL
 #define CKM_ACTI_KEY_GEN               0x000002A1UL
 
+#define CKM_SHA3_256                   0x000002B0UL
+#define CKM_SHA3_256_HMAC              0x000002B1UL
+#define CKM_SHA3_256_HMAC_GENERAL      0x000002B2UL
+#define CKM_SHA3_256_KEY_GEN           0x000002B3UL
+#define CKM_SHA3_224                   0x000002B5UL
+#define CKM_SHA3_224_HMAC              0x000002B6UL
+#define CKM_SHA3_224_HMAC_GENERAL      0x000002B7UL
+#define CKM_SHA3_224_KEY_GEN           0x000002B8UL
+#define CKM_SHA3_384                   0x000002C0UL
+#define CKM_SHA3_384_HMAC              0x000002C1UL
+#define CKM_SHA3_384_HMAC_GENERAL      0x000002C2UL
+#define CKM_SHA3_384_KEY_GEN           0x000002C3UL
+#define CKM_SHA3_512                   0x000002D0UL
+#define CKM_SHA3_512_HMAC              0x000002D1UL
+#define CKM_SHA3_512_HMAC_GENERAL      0x000002D2UL
+#define CKM_SHA3_512_KEY_GEN           0x000002D3UL
+
+
 #define CKM_CAST_KEY_GEN               0x00000300UL
 #define CKM_CAST_ECB                   0x00000301UL
 #define CKM_CAST_CBC                   0x00000302UL
@@ -789,6 +867,18 @@
 #define CKM_SHA384_KEY_DERIVATION      0x00000394UL
 #define CKM_SHA512_KEY_DERIVATION      0x00000395UL
 #define CKM_SHA224_KEY_DERIVATION      0x00000396UL
+#define CKM_SHA3_256_KEY_DERIVATION    0x00000397UL
+#define CKM_SHA3_224_KEY_DERIVATION    0x00000398UL
+#define CKM_SHA3_384_KEY_DERIVATION    0x00000399UL
+#define CKM_SHA3_512_KEY_DERIVATION    0x0000039AUL
+#define CKM_SHAKE_128_KEY_DERIVATION   0x0000039BUL
+#define CKM_SHAKE_256_KEY_DERIVATION   0x0000039CUL
+#define CKM_SHA3_256_KEY_DERIVE  CKM_SHA3_256_KEY_DERIVATION
+#define CKM_SHA3_224_KEY_DERIVE  CKM_SHA3_224_KEY_DERIVATION
+#define CKM_SHA3_384_KEY_DERIVE  CKM_SHA3_384_KEY_DERIVATION
+#define CKM_SHA3_512_KEY_DERIVE  CKM_SHA3_512_KEY_DERIVATION
+#define CKM_SHAKE_128_KEY_DERIVE CKM_SHAKE_128_KEY_DERIVATION
+#define CKM_SHAKE_256_KEY_DERIVE CKM_SHAKE_256_KEY_DERIVATION
 
 #define CKM_PBE_MD2_DES_CBC            0x000003A0UL
 #define CKM_PBE_MD5_DES_CBC            0x000003A1UL
@@ -816,8 +906,6 @@
 #define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE  0x000003D4UL
 #define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE  0x000003D5UL
 
-#define CKM_TLS10_MAC_SERVER                0x000003D6UL
-#define CKM_TLS10_MAC_CLIENT                0x000003D7UL
 #define CKM_TLS12_MAC                       0x000003D8UL
 #define CKM_TLS12_KDF                       0x000003D9UL
 #define CKM_TLS12_MASTER_KEY_DERIVE         0x000003E0UL
@@ -895,6 +983,7 @@
 #define CKM_ECDSA_SHA256               0x00001044UL
 #define CKM_ECDSA_SHA384               0x00001045UL
 #define CKM_ECDSA_SHA512               0x00001046UL
+#define CKM_EC_KEY_PAIR_GEN_W_EXTRA_BITS 0x0000140BUL
 
 #define CKM_ECDH1_DERIVE               0x00001050UL
 #define CKM_ECDH1_COFACTOR_DERIVE      0x00001051UL
@@ -911,6 +1000,8 @@
 #define CKM_JUNIPER_WRAP               0x00001065UL
 #define CKM_FASTHASH                   0x00001070UL
 
+#define CKM_AES_XTS                    0x00001071UL
+#define CKM_AES_XTS_KEY_GEN            0x00001072UL
 #define CKM_AES_KEY_GEN                0x00001080UL
 #define CKM_AES_ECB                    0x00001081UL
 #define CKM_AES_CBC                    0x00001082UL
@@ -954,12 +1045,17 @@
 #define CKM_GOST28147                  0x00001222UL
 #define CKM_GOST28147_MAC              0x00001223UL
 #define CKM_GOST28147_KEY_WRAP         0x00001224UL
-
+#define CKM_CHACHA20_KEY_GEN           0x00001225UL
+#define CKM_CHACHA20                   0x00001226UL
+#define CKM_POLY1305_KEY_GEN           0x00001227UL
+#define CKM_POLY1305                   0x00001228UL
 #define CKM_DSA_PARAMETER_GEN          0x00002000UL
 #define CKM_DH_PKCS_PARAMETER_GEN      0x00002001UL
 #define CKM_X9_42_DH_PARAMETER_GEN     0x00002002UL
-#define CKM_DSA_PROBABLISTIC_PARAMETER_GEN    0x00002003UL
+#define CKM_DSA_PROBABILISTIC_PARAMETER_GEN 0x00002003UL
+#define CKM_DSA_PROBABLISTIC_PARAMETER_GEN CKM_DSA_PROBABILISTIC_PARAMETER_GEN
 #define CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN    0x00002004UL
+#define CKM_DSA_FIPS_G_GEN               0x00002005UL
 
 #define CKM_AES_OFB                    0x00002104UL
 #define CKM_AES_CFB64                  0x00002105UL
@@ -969,10 +1065,66 @@
 #define CKM_AES_CFB1                   0x00002108UL
 #define CKM_AES_KEY_WRAP               0x00002109UL     /* WAS: 0x00001090 */
 #define CKM_AES_KEY_WRAP_PAD           0x0000210AUL     /* WAS: 0x00001091 */
+#define CKM_AES_KEY_WRAP_KWP           0x0000210BUL
 
 #define CKM_RSA_PKCS_TPM_1_1           0x00004001UL
 #define CKM_RSA_PKCS_OAEP_TPM_1_1      0x00004002UL
 
+#define CKM_SHA_1_KEY_GEN              0x00004003UL
+#define CKM_SHA224_KEY_GEN             0x00004004UL
+#define CKM_SHA256_KEY_GEN             0x00004005UL
+#define CKM_SHA384_KEY_GEN             0x00004006UL
+#define CKM_SHA512_KEY_GEN             0x00004007UL
+#define CKM_SHA512_224_KEY_GEN         0x00004008UL
+#define CKM_SHA512_256_KEY_GEN         0x00004009UL
+#define CKM_SHA512_T_KEY_GEN           0x0000400aUL
+#define CKM_NULL                       0x0000400bUL
+#define CKM_BLAKE2B_160                0x0000400cUL
+#define CKM_BLAKE2B_160_HMAC           0x0000400dUL
+#define CKM_BLAKE2B_160_HMAC_GENERAL   0x0000400eUL
+#define CKM_BLAKE2B_160_KEY_DERIVE     0x0000400fUL
+#define CKM_BLAKE2B_160_KEY_GEN        0x00004010UL
+#define CKM_BLAKE2B_256                0x00004011UL
+#define CKM_BLAKE2B_256_HMAC           0x00004012UL
+#define CKM_BLAKE2B_256_HMAC_GENERAL   0x00004013UL
+#define CKM_BLAKE2B_256_KEY_DERIVE     0x00004014UL
+#define CKM_BLAKE2B_256_KEY_GEN        0x00004015UL
+#define CKM_BLAKE2B_384                0x00004016UL
+#define CKM_BLAKE2B_384_HMAC           0x00004017UL
+#define CKM_BLAKE2B_384_HMAC_GENERAL   0x00004018UL
+#define CKM_BLAKE2B_384_KEY_DERIVE     0x00004019UL
+#define CKM_BLAKE2B_384_KEY_GEN        0x0000401aUL
+#define CKM_BLAKE2B_512                0x0000401bUL
+#define CKM_BLAKE2B_512_HMAC           0x0000401cUL
+#define CKM_BLAKE2B_512_HMAC_GENERAL   0x0000401dUL
+#define CKM_BLAKE2B_512_KEY_DERIVE     0x0000401eUL
+#define CKM_BLAKE2B_512_KEY_GEN        0x0000401fUL
+#define CKM_SALSA20                    0x00004020UL
+#define CKM_CHACHA20_POLY1305          0x00004021UL
+#define CKM_SALSA20_POLY1305           0x00004022UL
+#define CKM_X3DH_INITIALIZE            0x00004023UL
+#define CKM_X3DH_RESPOND               0x00004024UL
+#define CKM_X2RATCHET_INITIALIZE       0x00004025UL
+#define CKM_X2RATCHET_RESPOND          0x00004026UL
+#define CKM_X2RATCHET_ENCRYPT          0x00004027UL
+#define CKM_X2RATCHET_DECRYPT          0x00004028UL
+#define CKM_XEDDSA                     0x00004029UL
+#define CKM_HKDF_DERIVE                0x0000402aUL
+#define CKM_HKDF_DATA                  0x0000402bUL
+#define CKM_HKDF_KEY_GEN               0x0000402cUL
+#define CKM_SALSA20_KEY_GEN            0x0000402dUL
+
+#define CKM_ECDSA_SHA3_224             0x00001047UL
+#define CKM_ECDSA_SHA3_256             0x00001048UL
+#define CKM_ECDSA_SHA3_384             0x00001049UL
+#define CKM_ECDSA_SHA3_512             0x0000104aUL
+#define CKM_EC_EDWARDS_KEY_PAIR_GEN    0x00001055UL
+#define CKM_EC_MONTGOMERY_KEY_PAIR_GEN 0x00001056UL
+#define CKM_EDDSA                      0x00001057UL
+#define CKM_SP800_108_COUNTER_KDF      0x000003acUL
+#define CKM_SP800_108_FEEDBACK_KDF     0x000003adUL
+#define CKM_SP800_108_DOUBLE_PIPELINE_KDF 0x000003aeUL
+
 #define CKM_VENDOR_DEFINED             0x80000000UL
 
 typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
@@ -982,9 +1134,9 @@
  * mechanism
  */
 typedef struct CK_MECHANISM {
-  CK_MECHANISM_TYPE mechanism;
-  CK_VOID_PTR       pParameter;
-  CK_ULONG          ulParameterLen;  /* in bytes */
+    CK_MECHANISM_TYPE mechanism;
+    CK_VOID_PTR       pParameter;
+    CK_ULONG          ulParameterLen;  /* in bytes */
 } CK_MECHANISM;
 
 typedef CK_MECHANISM CK_PTR CK_MECHANISM_PTR;
@@ -994,9 +1146,9 @@
  * mechanism
  */
 typedef struct CK_MECHANISM_INFO {
-    CK_ULONG    ulMinKeySize;
-    CK_ULONG    ulMaxKeySize;
-    CK_FLAGS    flags;
+    CK_ULONG ulMinKeySize;
+    CK_ULONG ulMaxKeySize;
+    CK_FLAGS flags;
 } CK_MECHANISM_INFO;
 
 /* The flags are defined as follows:
@@ -1004,6 +1156,14 @@
 #define CKF_HW                 0x00000001UL  /* performed by HW */
 
 /* Specify whether or not a mechanism can be used for a particular task */
+#define CKF_MESSAGE_ENCRYPT    0x00000002UL
+#define CKF_MESSAGE_DECRYPT    0x00000004UL
+#define CKF_MESSAGE_SIGN       0x00000008UL
+#define CKF_MESSAGE_VERIFY     0x00000010UL
+#define CKF_MULTI_MESSAGE      0x00000020UL
+#define CKF_MULTI_MESSGE       CKF_MULTI_MESSAGE
+#define CKF_FIND_OBJECTS       0x00000040UL
+
 #define CKF_ENCRYPT            0x00000100UL
 #define CKF_DECRYPT            0x00000200UL
 #define CKF_DIGEST             0x00000400UL
@@ -1023,9 +1183,11 @@
 #define CKF_EC_F_P             0x00100000UL
 #define CKF_EC_F_2M            0x00200000UL
 #define CKF_EC_ECPARAMETERS    0x00400000UL
-#define CKF_EC_NAMEDCURVE      0x00800000UL
+#define CKF_EC_OID             0x00800000UL
+#define CKF_EC_NAMEDCURVE      CKF_EC_OID   /* deprecated since PKCS#11 3.00 */
 #define CKF_EC_UNCOMPRESS      0x01000000UL
 #define CKF_EC_COMPRESS        0x02000000UL
+#define CKF_EC_CURVENAME       0x04000000UL
 
 #define CKF_EXTENSION          0x80000000UL
 
@@ -1063,6 +1225,7 @@
 #define CKR_DEVICE_REMOVED                    0x00000032UL
 #define CKR_ENCRYPTED_DATA_INVALID            0x00000040UL
 #define CKR_ENCRYPTED_DATA_LEN_RANGE          0x00000041UL
+#define CKR_AEAD_DECRYPT_FAILED               0x00000042UL
 #define CKR_FUNCTION_CANCELED                 0x00000050UL
 #define CKR_FUNCTION_NOT_PARALLEL             0x00000051UL
 
@@ -1155,15 +1318,17 @@
 #define CKR_PUBLIC_KEY_INVALID                0x000001B9UL
 
 #define CKR_FUNCTION_REJECTED                 0x00000200UL
+#define CKR_TOKEN_RESOURCE_EXCEEDED           0x00000201UL
+#define CKR_OPERATION_CANCEL_FAILED           0x00000202UL
 
 #define CKR_VENDOR_DEFINED                    0x80000000UL
 
 
 /* CK_NOTIFY is an application callback that processes events */
 typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_NOTIFICATION   event,
-  CK_VOID_PTR       pApplication  /* passed to C_OpenSession */
+    CK_SESSION_HANDLE hSession,     /* the session's handle */
+    CK_NOTIFICATION   event,
+    CK_VOID_PTR       pApplication  /* passed to C_OpenSession */
 );
 
 
@@ -1172,17 +1337,31 @@
  * Cryptoki functions
  */
 typedef struct CK_FUNCTION_LIST CK_FUNCTION_LIST;
+typedef struct CK_FUNCTION_LIST_3_0 CK_FUNCTION_LIST_3_0;
 
 typedef CK_FUNCTION_LIST CK_PTR CK_FUNCTION_LIST_PTR;
+typedef CK_FUNCTION_LIST_3_0 CK_PTR CK_FUNCTION_LIST_3_0_PTR;
 
 typedef CK_FUNCTION_LIST_PTR CK_PTR CK_FUNCTION_LIST_PTR_PTR;
+typedef CK_FUNCTION_LIST_3_0_PTR CK_PTR CK_FUNCTION_LIST_3_0_PTR_PTR;
+
+typedef struct CK_INTERFACE {
+    CK_CHAR     *pInterfaceName;
+    CK_VOID_PTR pFunctionList;
+    CK_FLAGS    flags;
+} CK_INTERFACE;
+
+typedef CK_INTERFACE CK_PTR CK_INTERFACE_PTR;
+typedef CK_INTERFACE_PTR CK_PTR CK_INTERFACE_PTR_PTR;
+
+#define CKF_END_OF_MESSAGE   0x00000001UL
 
 
 /* CK_CREATEMUTEX is an application callback for creating a
  * mutex object
  */
 typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(
-  CK_VOID_PTR_PTR ppMutex  /* location to receive ptr to mutex */
+    CK_VOID_PTR_PTR ppMutex  /* location to receive ptr to mutex */
 );
 
 
@@ -1190,13 +1369,13 @@
  * mutex object
  */
 typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+    CK_VOID_PTR pMutex  /* pointer to mutex */
 );
 
 
 /* CK_LOCKMUTEX is an application callback for locking a mutex */
 typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+    CK_VOID_PTR pMutex  /* pointer to mutex */
 );
 
 
@@ -1204,20 +1383,22 @@
  * mutex
  */
 typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+    CK_VOID_PTR pMutex  /* pointer to mutex */
 );
 
+/* Get functionlist flags */
+#define CKF_INTERFACE_FORK_SAFE  0x00000001UL
 
 /* CK_C_INITIALIZE_ARGS provides the optional arguments to
  * C_Initialize
  */
 typedef struct CK_C_INITIALIZE_ARGS {
-  CK_CREATEMUTEX CreateMutex;
-  CK_DESTROYMUTEX DestroyMutex;
-  CK_LOCKMUTEX LockMutex;
-  CK_UNLOCKMUTEX UnlockMutex;
-  CK_FLAGS flags;
-  CK_VOID_PTR pReserved;
+    CK_CREATEMUTEX  CreateMutex;
+    CK_DESTROYMUTEX DestroyMutex;
+    CK_LOCKMUTEX    LockMutex;
+    CK_UNLOCKMUTEX  UnlockMutex;
+    CK_FLAGS        flags;
+    CK_VOID_PTR     pReserved;
 } CK_C_INITIALIZE_ARGS;
 
 /* flags: bit flags that provide capabilities of the slot
@@ -1229,6 +1410,7 @@
 typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
 
 
+
 /* additional flags for parameters to functions */
 
 /* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
@@ -1249,6 +1431,10 @@
 #define CKG_MGF1_SHA384       0x00000003UL
 #define CKG_MGF1_SHA512       0x00000004UL
 #define CKG_MGF1_SHA224       0x00000005UL
+#define CKG_MGF1_SHA3_224     0x00000006UL
+#define CKG_MGF1_SHA3_256     0x00000007UL
+#define CKG_MGF1_SHA3_384     0x00000008UL
+#define CKG_MGF1_SHA3_512     0x00000009UL
 
 /* CK_RSA_PKCS_OAEP_SOURCE_TYPE  is used to indicate the source
  * of the encoding parameter when formatting a message block
@@ -1265,11 +1451,11 @@
  * CKM_RSA_PKCS_OAEP mechanism.
  */
 typedef struct CK_RSA_PKCS_OAEP_PARAMS {
-        CK_MECHANISM_TYPE hashAlg;
-        CK_RSA_PKCS_MGF_TYPE mgf;
-        CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
-        CK_VOID_PTR pSourceData;
-        CK_ULONG ulSourceDataLen;
+    CK_MECHANISM_TYPE            hashAlg;
+    CK_RSA_PKCS_MGF_TYPE         mgf;
+    CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
+    CK_VOID_PTR                  pSourceData;
+    CK_ULONG                     ulSourceDataLen;
 } CK_RSA_PKCS_OAEP_PARAMS;
 
 typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
@@ -1278,14 +1464,15 @@
  * CKM_RSA_PKCS_PSS mechanism(s).
  */
 typedef struct CK_RSA_PKCS_PSS_PARAMS {
-        CK_MECHANISM_TYPE    hashAlg;
-        CK_RSA_PKCS_MGF_TYPE mgf;
-        CK_ULONG             sLen;
+    CK_MECHANISM_TYPE    hashAlg;
+    CK_RSA_PKCS_MGF_TYPE mgf;
+    CK_ULONG             sLen;
 } CK_RSA_PKCS_PSS_PARAMS;
 
 typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
 
 typedef CK_ULONG CK_EC_KDF_TYPE;
+typedef CK_EC_KDF_TYPE CK_PTR CK_EC_KDF_TYPE_PTR;
 
 /* The following EC Key Derivation Functions are defined */
 #define CKD_NULL                 0x00000001UL
@@ -1299,18 +1486,34 @@
 #define CKD_SHA384_KDF           0x00000007UL
 #define CKD_SHA512_KDF           0x00000008UL
 #define CKD_CPDIVERSIFY_KDF      0x00000009UL
-
+#define CKD_SHA3_224_KDF         0x0000000AUL
+#define CKD_SHA3_256_KDF         0x0000000BUL
+#define CKD_SHA3_384_KDF         0x0000000CUL
+#define CKD_SHA3_512_KDF         0x0000000DUL
+#define CKD_SHA1_KDF_SP800       0x0000000EUL
+#define CKD_SHA224_KDF_SP800     0x0000000FUL
+#define CKD_SHA256_KDF_SP800     0x00000010UL
+#define CKD_SHA384_KDF_SP800     0x00000011UL
+#define CKD_SHA512_KDF_SP800     0x00000012UL
+#define CKD_SHA3_224_KDF_SP800   0x00000013UL
+#define CKD_SHA3_256_KDF_SP800   0x00000014UL
+#define CKD_SHA3_384_KDF_SP800   0x00000015UL
+#define CKD_SHA3_512_KDF_SP800   0x00000016UL
+#define CKD_BLAKE2B_160_KDF      0x00000017UL
+#define CKD_BLAKE2B_256_KDF      0x00000018UL
+#define CKD_BLAKE2B_384_KDF      0x00000019UL
+#define CKD_BLAKE2B_512_KDF      0x0000001aUL
 
 /* CK_ECDH1_DERIVE_PARAMS provides the parameters to the
  * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms,
  * where each party contributes one key pair.
  */
 typedef struct CK_ECDH1_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
+    CK_EC_KDF_TYPE kdf;
+    CK_ULONG       ulSharedDataLen;
+    CK_BYTE_PTR    pSharedData;
+    CK_ULONG       ulPublicDataLen;
+    CK_BYTE_PTR    pPublicData;
 } CK_ECDH1_DERIVE_PARAMS;
 
 typedef CK_ECDH1_DERIVE_PARAMS CK_PTR CK_ECDH1_DERIVE_PARAMS_PTR;
@@ -1320,30 +1523,30 @@
  * CKM_ECMQV_DERIVE mechanism, where each party contributes two key pairs.
  */
 typedef struct CK_ECDH2_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
+    CK_EC_KDF_TYPE   kdf;
+    CK_ULONG         ulSharedDataLen;
+    CK_BYTE_PTR      pSharedData;
+    CK_ULONG         ulPublicDataLen;
+    CK_BYTE_PTR      pPublicData;
+    CK_ULONG         ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG         ulPublicDataLen2;
+    CK_BYTE_PTR      pPublicData2;
 } CK_ECDH2_DERIVE_PARAMS;
 
 typedef CK_ECDH2_DERIVE_PARAMS CK_PTR CK_ECDH2_DERIVE_PARAMS_PTR;
 
 typedef struct CK_ECMQV_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
-  CK_OBJECT_HANDLE publicKey;
+    CK_EC_KDF_TYPE   kdf;
+    CK_ULONG         ulSharedDataLen;
+    CK_BYTE_PTR      pSharedData;
+    CK_ULONG         ulPublicDataLen;
+    CK_BYTE_PTR      pPublicData;
+    CK_ULONG         ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG         ulPublicDataLen2;
+    CK_BYTE_PTR      pPublicData2;
+    CK_OBJECT_HANDLE publicKey;
 } CK_ECMQV_DERIVE_PARAMS;
 
 typedef CK_ECMQV_DERIVE_PARAMS CK_PTR CK_ECMQV_DERIVE_PARAMS_PTR;
@@ -1359,11 +1562,11 @@
  * contributes one key pair
  */
 typedef struct CK_X9_42_DH1_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG             ulOtherInfoLen;
+    CK_BYTE_PTR          pOtherInfo;
+    CK_ULONG             ulPublicDataLen;
+    CK_BYTE_PTR          pPublicData;
 } CK_X9_42_DH1_DERIVE_PARAMS;
 
 typedef struct CK_X9_42_DH1_DERIVE_PARAMS CK_PTR CK_X9_42_DH1_DERIVE_PARAMS_PTR;
@@ -1373,30 +1576,30 @@
  * mechanisms, where each party contributes two key pairs
  */
 typedef struct CK_X9_42_DH2_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG             ulOtherInfoLen;
+    CK_BYTE_PTR          pOtherInfo;
+    CK_ULONG             ulPublicDataLen;
+    CK_BYTE_PTR          pPublicData;
+    CK_ULONG             ulPrivateDataLen;
+    CK_OBJECT_HANDLE     hPrivateData;
+    CK_ULONG             ulPublicDataLen2;
+    CK_BYTE_PTR          pPublicData2;
 } CK_X9_42_DH2_DERIVE_PARAMS;
 
 typedef CK_X9_42_DH2_DERIVE_PARAMS CK_PTR CK_X9_42_DH2_DERIVE_PARAMS_PTR;
 
 typedef struct CK_X9_42_MQV_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
-  CK_OBJECT_HANDLE publicKey;
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG             ulOtherInfoLen;
+    CK_BYTE_PTR          pOtherInfo;
+    CK_ULONG             ulPublicDataLen;
+    CK_BYTE_PTR          pPublicData;
+    CK_ULONG             ulPrivateDataLen;
+    CK_OBJECT_HANDLE     hPrivateData;
+    CK_ULONG             ulPublicDataLen2;
+    CK_BYTE_PTR          pPublicData2;
+    CK_OBJECT_HANDLE     publicKey;
 } CK_X9_42_MQV_DERIVE_PARAMS;
 
 typedef CK_X9_42_MQV_DERIVE_PARAMS CK_PTR CK_X9_42_MQV_DERIVE_PARAMS_PTR;
@@ -1405,12 +1608,12 @@
  * CKM_KEA_DERIVE mechanism
  */
 typedef struct CK_KEA_DERIVE_PARAMS {
-  CK_BBOOL      isSender;
-  CK_ULONG      ulRandomLen;
-  CK_BYTE_PTR   pRandomA;
-  CK_BYTE_PTR   pRandomB;
-  CK_ULONG      ulPublicDataLen;
-  CK_BYTE_PTR   pPublicData;
+    CK_BBOOL    isSender;
+    CK_ULONG    ulRandomLen;
+    CK_BYTE_PTR pRandomA;
+    CK_BYTE_PTR pRandomB;
+    CK_ULONG    ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
 } CK_KEA_DERIVE_PARAMS;
 
 typedef CK_KEA_DERIVE_PARAMS CK_PTR CK_KEA_DERIVE_PARAMS_PTR;
@@ -1429,8 +1632,8 @@
  * mechanism
  */
 typedef struct CK_RC2_CBC_PARAMS {
-  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
-  CK_BYTE       iv[8];            /* IV for CBC mode */
+    CK_ULONG ulEffectiveBits;  /* effective bits (1-1024) */
+    CK_BYTE  iv[8];            /* IV for CBC mode */
 } CK_RC2_CBC_PARAMS;
 
 typedef CK_RC2_CBC_PARAMS CK_PTR CK_RC2_CBC_PARAMS_PTR;
@@ -1440,20 +1643,20 @@
  * CKM_RC2_MAC_GENERAL mechanism
  */
 typedef struct CK_RC2_MAC_GENERAL_PARAMS {
-  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
-  CK_ULONG      ulMacLength;      /* Length of MAC in bytes */
+    CK_ULONG ulEffectiveBits;  /* effective bits (1-1024) */
+    CK_ULONG ulMacLength;      /* Length of MAC in bytes */
 } CK_RC2_MAC_GENERAL_PARAMS;
 
 typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR \
-  CK_RC2_MAC_GENERAL_PARAMS_PTR;
+        CK_RC2_MAC_GENERAL_PARAMS_PTR;
 
 
 /* CK_RC5_PARAMS provides the parameters to the CKM_RC5_ECB and
  * CKM_RC5_MAC mechanisms
  */
 typedef struct CK_RC5_PARAMS {
-  CK_ULONG      ulWordsize;  /* wordsize in bits */
-  CK_ULONG      ulRounds;    /* number of rounds */
+    CK_ULONG ulWordsize;  /* wordsize in bits */
+    CK_ULONG ulRounds;    /* number of rounds */
 } CK_RC5_PARAMS;
 
 typedef CK_RC5_PARAMS CK_PTR CK_RC5_PARAMS_PTR;
@@ -1463,10 +1666,10 @@
  * mechanism
  */
 typedef struct CK_RC5_CBC_PARAMS {
-  CK_ULONG      ulWordsize;  /* wordsize in bits */
-  CK_ULONG      ulRounds;    /* number of rounds */
-  CK_BYTE_PTR   pIv;         /* pointer to IV */
-  CK_ULONG      ulIvLen;     /* length of IV in bytes */
+    CK_ULONG    ulWordsize;  /* wordsize in bits */
+    CK_ULONG    ulRounds;    /* number of rounds */
+    CK_BYTE_PTR pIv;         /* pointer to IV */
+    CK_ULONG    ulIvLen;     /* length of IV in bytes */
 } CK_RC5_CBC_PARAMS;
 
 typedef CK_RC5_CBC_PARAMS CK_PTR CK_RC5_CBC_PARAMS_PTR;
@@ -1476,13 +1679,13 @@
  * CKM_RC5_MAC_GENERAL mechanism
  */
 typedef struct CK_RC5_MAC_GENERAL_PARAMS {
-  CK_ULONG      ulWordsize;   /* wordsize in bits */
-  CK_ULONG      ulRounds;     /* number of rounds */
-  CK_ULONG      ulMacLength;  /* Length of MAC in bytes */
+    CK_ULONG ulWordsize;   /* wordsize in bits */
+    CK_ULONG ulRounds;     /* number of rounds */
+    CK_ULONG ulMacLength;  /* Length of MAC in bytes */
 } CK_RC5_MAC_GENERAL_PARAMS;
 
 typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR \
-  CK_RC5_MAC_GENERAL_PARAMS_PTR;
+        CK_RC5_MAC_GENERAL_PARAMS_PTR;
 
 /* CK_MAC_GENERAL_PARAMS provides the parameters to most block
  * ciphers' MAC_GENERAL mechanisms.  Its value is the length of
@@ -1493,73 +1696,75 @@
 typedef CK_MAC_GENERAL_PARAMS CK_PTR CK_MAC_GENERAL_PARAMS_PTR;
 
 typedef struct CK_DES_CBC_ENCRYPT_DATA_PARAMS {
-  CK_BYTE      iv[8];
-  CK_BYTE_PTR  pData;
-  CK_ULONG     length;
+    CK_BYTE     iv[8];
+    CK_BYTE_PTR pData;
+    CK_ULONG    length;
 } CK_DES_CBC_ENCRYPT_DATA_PARAMS;
 
-typedef CK_DES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_DES_CBC_ENCRYPT_DATA_PARAMS_PTR;
+typedef CK_DES_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
+        CK_DES_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 typedef struct CK_AES_CBC_ENCRYPT_DATA_PARAMS {
-  CK_BYTE      iv[16];
-  CK_BYTE_PTR  pData;
-  CK_ULONG     length;
+    CK_BYTE     iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG    length;
 } CK_AES_CBC_ENCRYPT_DATA_PARAMS;
 
-typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
+typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
+        CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 /* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
  * CKM_SKIPJACK_PRIVATE_WRAP mechanism
  */
 typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS {
-  CK_ULONG      ulPasswordLen;
-  CK_BYTE_PTR   pPassword;
-  CK_ULONG      ulPublicDataLen;
-  CK_BYTE_PTR   pPublicData;
-  CK_ULONG      ulPAndGLen;
-  CK_ULONG      ulQLen;
-  CK_ULONG      ulRandomLen;
-  CK_BYTE_PTR   pRandomA;
-  CK_BYTE_PTR   pPrimeP;
-  CK_BYTE_PTR   pBaseG;
-  CK_BYTE_PTR   pSubprimeQ;
+    CK_ULONG    ulPasswordLen;
+    CK_BYTE_PTR pPassword;
+    CK_ULONG    ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG    ulPAndGLen;
+    CK_ULONG    ulQLen;
+    CK_ULONG    ulRandomLen;
+    CK_BYTE_PTR pRandomA;
+    CK_BYTE_PTR pPrimeP;
+    CK_BYTE_PTR pBaseG;
+    CK_BYTE_PTR pSubprimeQ;
 } CK_SKIPJACK_PRIVATE_WRAP_PARAMS;
 
 typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR \
-  CK_SKIPJACK_PRIVATE_WRAP_PARAMS_PTR;
+        CK_SKIPJACK_PRIVATE_WRAP_PARAMS_PTR;
 
 
 /* CK_SKIPJACK_RELAYX_PARAMS provides the parameters to the
  * CKM_SKIPJACK_RELAYX mechanism
  */
 typedef struct CK_SKIPJACK_RELAYX_PARAMS {
-  CK_ULONG      ulOldWrappedXLen;
-  CK_BYTE_PTR   pOldWrappedX;
-  CK_ULONG      ulOldPasswordLen;
-  CK_BYTE_PTR   pOldPassword;
-  CK_ULONG      ulOldPublicDataLen;
-  CK_BYTE_PTR   pOldPublicData;
-  CK_ULONG      ulOldRandomLen;
-  CK_BYTE_PTR   pOldRandomA;
-  CK_ULONG      ulNewPasswordLen;
-  CK_BYTE_PTR   pNewPassword;
-  CK_ULONG      ulNewPublicDataLen;
-  CK_BYTE_PTR   pNewPublicData;
-  CK_ULONG      ulNewRandomLen;
-  CK_BYTE_PTR   pNewRandomA;
+    CK_ULONG    ulOldWrappedXLen;
+    CK_BYTE_PTR pOldWrappedX;
+    CK_ULONG    ulOldPasswordLen;
+    CK_BYTE_PTR pOldPassword;
+    CK_ULONG    ulOldPublicDataLen;
+    CK_BYTE_PTR pOldPublicData;
+    CK_ULONG    ulOldRandomLen;
+    CK_BYTE_PTR pOldRandomA;
+    CK_ULONG    ulNewPasswordLen;
+    CK_BYTE_PTR pNewPassword;
+    CK_ULONG    ulNewPublicDataLen;
+    CK_BYTE_PTR pNewPublicData;
+    CK_ULONG    ulNewRandomLen;
+    CK_BYTE_PTR pNewRandomA;
 } CK_SKIPJACK_RELAYX_PARAMS;
 
 typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR \
-  CK_SKIPJACK_RELAYX_PARAMS_PTR;
+        CK_SKIPJACK_RELAYX_PARAMS_PTR;
 
 
 typedef struct CK_PBE_PARAMS {
-  CK_BYTE_PTR      pInitVector;
-  CK_UTF8CHAR_PTR  pPassword;
-  CK_ULONG         ulPasswordLen;
-  CK_BYTE_PTR      pSalt;
-  CK_ULONG         ulSaltLen;
-  CK_ULONG         ulIteration;
+    CK_BYTE_PTR     pInitVector;
+    CK_UTF8CHAR_PTR pPassword;
+    CK_ULONG        ulPasswordLen;
+    CK_BYTE_PTR     pSalt;
+    CK_ULONG        ulSaltLen;
+    CK_ULONG        ulIteration;
 } CK_PBE_PARAMS;
 
 typedef CK_PBE_PARAMS CK_PTR CK_PBE_PARAMS_PTR;
@@ -1569,134 +1774,134 @@
  * CKM_KEY_WRAP_SET_OAEP mechanism
  */
 typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS {
-  CK_BYTE       bBC;     /* block contents byte */
-  CK_BYTE_PTR   pX;      /* extra data */
-  CK_ULONG      ulXLen;  /* length of extra data in bytes */
+    CK_BYTE     bBC;     /* block contents byte */
+    CK_BYTE_PTR pX;      /* extra data */
+    CK_ULONG    ulXLen;  /* length of extra data in bytes */
 } CK_KEY_WRAP_SET_OAEP_PARAMS;
 
 typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
 
 typedef struct CK_SSL3_RANDOM_DATA {
-  CK_BYTE_PTR  pClientRandom;
-  CK_ULONG     ulClientRandomLen;
-  CK_BYTE_PTR  pServerRandom;
-  CK_ULONG     ulServerRandomLen;
+    CK_BYTE_PTR pClientRandom;
+    CK_ULONG    ulClientRandomLen;
+    CK_BYTE_PTR pServerRandom;
+    CK_ULONG    ulServerRandomLen;
 } CK_SSL3_RANDOM_DATA;
 
 
 typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS {
-  CK_SSL3_RANDOM_DATA RandomInfo;
-  CK_VERSION_PTR pVersion;
+    CK_SSL3_RANDOM_DATA RandomInfo;
+    CK_VERSION_PTR      pVersion;
 } CK_SSL3_MASTER_KEY_DERIVE_PARAMS;
 
 typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR \
-  CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
+        CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
 
 typedef struct CK_SSL3_KEY_MAT_OUT {
-  CK_OBJECT_HANDLE hClientMacSecret;
-  CK_OBJECT_HANDLE hServerMacSecret;
-  CK_OBJECT_HANDLE hClientKey;
-  CK_OBJECT_HANDLE hServerKey;
-  CK_BYTE_PTR      pIVClient;
-  CK_BYTE_PTR      pIVServer;
+    CK_OBJECT_HANDLE hClientMacSecret;
+    CK_OBJECT_HANDLE hServerMacSecret;
+    CK_OBJECT_HANDLE hClientKey;
+    CK_OBJECT_HANDLE hServerKey;
+    CK_BYTE_PTR      pIVClient;
+    CK_BYTE_PTR      pIVServer;
 } CK_SSL3_KEY_MAT_OUT;
 
 typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR;
 
 
 typedef struct CK_SSL3_KEY_MAT_PARAMS {
-  CK_ULONG                ulMacSizeInBits;
-  CK_ULONG                ulKeySizeInBits;
-  CK_ULONG                ulIVSizeInBits;
-  CK_BBOOL                bIsExport;
-  CK_SSL3_RANDOM_DATA     RandomInfo;
-  CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+    CK_ULONG                ulMacSizeInBits;
+    CK_ULONG                ulKeySizeInBits;
+    CK_ULONG                ulIVSizeInBits;
+    CK_BBOOL                bIsExport;
+    CK_SSL3_RANDOM_DATA     RandomInfo;
+    CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
 } CK_SSL3_KEY_MAT_PARAMS;
 
 typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR;
 
 typedef struct CK_TLS_PRF_PARAMS {
-  CK_BYTE_PTR  pSeed;
-  CK_ULONG     ulSeedLen;
-  CK_BYTE_PTR  pLabel;
-  CK_ULONG     ulLabelLen;
-  CK_BYTE_PTR  pOutput;
-  CK_ULONG_PTR pulOutputLen;
+    CK_BYTE_PTR  pSeed;
+    CK_ULONG     ulSeedLen;
+    CK_BYTE_PTR  pLabel;
+    CK_ULONG     ulLabelLen;
+    CK_BYTE_PTR  pOutput;
+    CK_ULONG_PTR pulOutputLen;
 } CK_TLS_PRF_PARAMS;
 
 typedef CK_TLS_PRF_PARAMS CK_PTR CK_TLS_PRF_PARAMS_PTR;
 
 typedef struct CK_WTLS_RANDOM_DATA {
-  CK_BYTE_PTR pClientRandom;
-  CK_ULONG    ulClientRandomLen;
-  CK_BYTE_PTR pServerRandom;
-  CK_ULONG    ulServerRandomLen;
+    CK_BYTE_PTR pClientRandom;
+    CK_ULONG    ulClientRandomLen;
+    CK_BYTE_PTR pServerRandom;
+    CK_ULONG    ulServerRandomLen;
 } CK_WTLS_RANDOM_DATA;
 
 typedef CK_WTLS_RANDOM_DATA CK_PTR CK_WTLS_RANDOM_DATA_PTR;
 
 typedef struct CK_WTLS_MASTER_KEY_DERIVE_PARAMS {
-  CK_MECHANISM_TYPE   DigestMechanism;
-  CK_WTLS_RANDOM_DATA RandomInfo;
-  CK_BYTE_PTR         pVersion;
+    CK_MECHANISM_TYPE   DigestMechanism;
+    CK_WTLS_RANDOM_DATA RandomInfo;
+    CK_BYTE_PTR         pVersion;
 } CK_WTLS_MASTER_KEY_DERIVE_PARAMS;
 
 typedef CK_WTLS_MASTER_KEY_DERIVE_PARAMS CK_PTR \
-  CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
+        CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
 
 typedef struct CK_WTLS_PRF_PARAMS {
-  CK_MECHANISM_TYPE DigestMechanism;
-  CK_BYTE_PTR       pSeed;
-  CK_ULONG          ulSeedLen;
-  CK_BYTE_PTR       pLabel;
-  CK_ULONG          ulLabelLen;
-  CK_BYTE_PTR       pOutput;
-  CK_ULONG_PTR      pulOutputLen;
+    CK_MECHANISM_TYPE DigestMechanism;
+    CK_BYTE_PTR       pSeed;
+    CK_ULONG          ulSeedLen;
+    CK_BYTE_PTR       pLabel;
+    CK_ULONG          ulLabelLen;
+    CK_BYTE_PTR       pOutput;
+    CK_ULONG_PTR      pulOutputLen;
 } CK_WTLS_PRF_PARAMS;
 
 typedef CK_WTLS_PRF_PARAMS CK_PTR CK_WTLS_PRF_PARAMS_PTR;
 
 typedef struct CK_WTLS_KEY_MAT_OUT {
-  CK_OBJECT_HANDLE hMacSecret;
-  CK_OBJECT_HANDLE hKey;
-  CK_BYTE_PTR      pIV;
+    CK_OBJECT_HANDLE hMacSecret;
+    CK_OBJECT_HANDLE hKey;
+    CK_BYTE_PTR      pIV;
 } CK_WTLS_KEY_MAT_OUT;
 
 typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR;
 
 typedef struct CK_WTLS_KEY_MAT_PARAMS {
-  CK_MECHANISM_TYPE       DigestMechanism;
-  CK_ULONG                ulMacSizeInBits;
-  CK_ULONG                ulKeySizeInBits;
-  CK_ULONG                ulIVSizeInBits;
-  CK_ULONG                ulSequenceNumber;
-  CK_BBOOL                bIsExport;
-  CK_WTLS_RANDOM_DATA     RandomInfo;
-  CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+    CK_MECHANISM_TYPE       DigestMechanism;
+    CK_ULONG                ulMacSizeInBits;
+    CK_ULONG                ulKeySizeInBits;
+    CK_ULONG                ulIVSizeInBits;
+    CK_ULONG                ulSequenceNumber;
+    CK_BBOOL                bIsExport;
+    CK_WTLS_RANDOM_DATA     RandomInfo;
+    CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
 } CK_WTLS_KEY_MAT_PARAMS;
 
 typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR;
 
 typedef struct CK_CMS_SIG_PARAMS {
-  CK_OBJECT_HANDLE      certificateHandle;
-  CK_MECHANISM_PTR      pSigningMechanism;
-  CK_MECHANISM_PTR      pDigestMechanism;
-  CK_UTF8CHAR_PTR       pContentType;
-  CK_BYTE_PTR           pRequestedAttributes;
-  CK_ULONG              ulRequestedAttributesLen;
-  CK_BYTE_PTR           pRequiredAttributes;
-  CK_ULONG              ulRequiredAttributesLen;
+    CK_OBJECT_HANDLE certificateHandle;
+    CK_MECHANISM_PTR pSigningMechanism;
+    CK_MECHANISM_PTR pDigestMechanism;
+    CK_UTF8CHAR_PTR  pContentType;
+    CK_BYTE_PTR      pRequestedAttributes;
+    CK_ULONG         ulRequestedAttributesLen;
+    CK_BYTE_PTR      pRequiredAttributes;
+    CK_ULONG         ulRequiredAttributesLen;
 } CK_CMS_SIG_PARAMS;
 
 typedef CK_CMS_SIG_PARAMS CK_PTR CK_CMS_SIG_PARAMS_PTR;
 
 typedef struct CK_KEY_DERIVATION_STRING_DATA {
-  CK_BYTE_PTR pData;
-  CK_ULONG    ulLen;
+    CK_BYTE_PTR pData;
+    CK_ULONG    ulLen;
 } CK_KEY_DERIVATION_STRING_DATA;
 
 typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR \
-  CK_KEY_DERIVATION_STRING_DATA_PTR;
+        CK_KEY_DERIVATION_STRING_DATA_PTR;
 
 
 /* The CK_EXTRACT_PARAMS is used for the
@@ -1715,7 +1920,7 @@
 typedef CK_ULONG CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE;
 
 typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR \
-                        CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
+        CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
 
 #define CKP_PKCS5_PBKD2_HMAC_SHA1          0x00000001UL
 #define CKP_PKCS5_PBKD2_HMAC_GOSTR3411     0x00000002UL
@@ -1733,7 +1938,7 @@
 typedef CK_ULONG CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE;
 
 typedef CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE CK_PTR \
-                        CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
+        CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
 
 /* The following salt value sources are defined in PKCS #5 v2.0. */
 #define CKZ_SALT_SPECIFIED        0x00000001UL
@@ -1742,15 +1947,15 @@
  * parameters to the CKM_PKCS5_PBKD2 mechanism.
  */
 typedef struct CK_PKCS5_PBKD2_PARAMS {
-        CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
-        CK_VOID_PTR                                pSaltSourceData;
-        CK_ULONG                                   ulSaltSourceDataLen;
-        CK_ULONG                                   iterations;
-        CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
-        CK_VOID_PTR                                pPrfData;
-        CK_ULONG                                   ulPrfDataLen;
-        CK_UTF8CHAR_PTR                            pPassword;
-        CK_ULONG_PTR                               ulPasswordLen;
+    CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
+    CK_VOID_PTR                                pSaltSourceData;
+    CK_ULONG                                   ulSaltSourceDataLen;
+    CK_ULONG                                   iterations;
+    CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
+    CK_VOID_PTR                                pPrfData;
+    CK_ULONG                                   ulPrfDataLen;
+    CK_UTF8CHAR_PTR                            pPassword;
+    CK_ULONG_PTR                               ulPasswordLen;
 } CK_PKCS5_PBKD2_PARAMS;
 
 typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
@@ -1760,15 +1965,15 @@
  * noting that the ulPasswordLen field is a CK_ULONG and not a CK_ULONG_PTR.
  */
 typedef struct CK_PKCS5_PBKD2_PARAMS2 {
-        CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE saltSource;
-        CK_VOID_PTR pSaltSourceData;
-        CK_ULONG ulSaltSourceDataLen;
-        CK_ULONG iterations;
-        CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
-        CK_VOID_PTR pPrfData;
-        CK_ULONG ulPrfDataLen;
-        CK_UTF8CHAR_PTR pPassword;
-        CK_ULONG ulPasswordLen;
+    CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
+    CK_VOID_PTR                                pSaltSourceData;
+    CK_ULONG                                   ulSaltSourceDataLen;
+    CK_ULONG                                   iterations;
+    CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
+    CK_VOID_PTR                                pPrfData;
+    CK_ULONG                                   ulPrfDataLen;
+    CK_UTF8CHAR_PTR                            pPassword;
+    CK_ULONG                                   ulPasswordLen;
 } CK_PKCS5_PBKD2_PARAMS2;
 
 typedef CK_PKCS5_PBKD2_PARAMS2 CK_PTR CK_PKCS5_PBKD2_PARAMS2_PTR;
@@ -1778,22 +1983,22 @@
 
 typedef struct CK_OTP_PARAM {
     CK_OTP_PARAM_TYPE type;
-    CK_VOID_PTR pValue;
-    CK_ULONG ulValueLen;
+    CK_VOID_PTR       pValue;
+    CK_ULONG          ulValueLen;
 } CK_OTP_PARAM;
 
 typedef CK_OTP_PARAM CK_PTR CK_OTP_PARAM_PTR;
 
 typedef struct CK_OTP_PARAMS {
     CK_OTP_PARAM_PTR pParams;
-    CK_ULONG ulCount;
+    CK_ULONG         ulCount;
 } CK_OTP_PARAMS;
 
 typedef CK_OTP_PARAMS CK_PTR CK_OTP_PARAMS_PTR;
 
 typedef struct CK_OTP_SIGNATURE_INFO {
     CK_OTP_PARAM_PTR pParams;
-    CK_ULONG ulCount;
+    CK_ULONG         ulCount;
 } CK_OTP_SIGNATURE_INFO;
 
 typedef CK_OTP_SIGNATURE_INFO CK_PTR CK_OTP_SIGNATURE_INFO_PTR;
@@ -1815,105 +2020,135 @@
 #define CKF_USER_FRIENDLY_OTP 0x00000020UL
 
 typedef struct CK_KIP_PARAMS {
-    CK_MECHANISM_PTR  pMechanism;
-    CK_OBJECT_HANDLE  hKey;
-    CK_BYTE_PTR       pSeed;
-    CK_ULONG          ulSeedLen;
+    CK_MECHANISM_PTR pMechanism;
+    CK_OBJECT_HANDLE hKey;
+    CK_BYTE_PTR      pSeed;
+    CK_ULONG         ulSeedLen;
 } CK_KIP_PARAMS;
 
 typedef CK_KIP_PARAMS CK_PTR CK_KIP_PARAMS_PTR;
 
 typedef struct CK_AES_CTR_PARAMS {
     CK_ULONG ulCounterBits;
-    CK_BYTE cb[16];
+    CK_BYTE  cb[16];
 } CK_AES_CTR_PARAMS;
 
 typedef CK_AES_CTR_PARAMS CK_PTR CK_AES_CTR_PARAMS_PTR;
 
 typedef struct CK_GCM_PARAMS {
-    CK_BYTE_PTR       pIv;
-    CK_ULONG          ulIvLen;
-    CK_BYTE_PTR       pAAD;
-    CK_ULONG          ulAADLen;
-    CK_ULONG          ulTagBits;
+    CK_BYTE_PTR pIv;
+    CK_ULONG    ulIvLen;
+    CK_ULONG    ulIvBits;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG    ulAADLen;
+    CK_ULONG    ulTagBits;
 } CK_GCM_PARAMS;
 
 typedef CK_GCM_PARAMS CK_PTR CK_GCM_PARAMS_PTR;
 
+typedef CK_ULONG CK_GENERATOR_FUNCTION;
+#define CKG_NO_GENERATE      0x00000000UL
+#define CKG_GENERATE         0x00000001UL
+#define CKG_GENERATE_COUNTER 0x00000002UL
+#define CKG_GENERATE_RANDOM  0x00000003UL
+
+typedef struct CK_GCM_MESSAGE_PARAMS {
+    CK_BYTE_PTR           pIv;
+    CK_ULONG              ulIvLen;
+    CK_ULONG              ulIvFixedBits;
+    CK_GENERATOR_FUNCTION ivGenerator;
+    CK_BYTE_PTR           pTag;
+    CK_ULONG              ulTagBits;
+} CK_GCM_MESSAGE_PARAMS;
+
+typedef CK_GCM_MESSAGE_PARAMS CK_GCM_MESSAGE_PARAMS_PTR;
+
 typedef struct CK_CCM_PARAMS {
-    CK_ULONG          ulDataLen;
-    CK_BYTE_PTR       pNonce;
-    CK_ULONG          ulNonceLen;
-    CK_BYTE_PTR       pAAD;
-    CK_ULONG          ulAADLen;
-    CK_ULONG          ulMACLen;
+    CK_ULONG    ulDataLen;
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceLen;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG    ulAADLen;
+    CK_ULONG    ulMACLen;
 } CK_CCM_PARAMS;
 
 typedef CK_CCM_PARAMS CK_PTR CK_CCM_PARAMS_PTR;
 
+typedef struct CK_CCM_MESSAGE_PARAMS {
+    CK_ULONG              ulDataLen; /*plaintext or ciphertext*/
+    CK_BYTE_PTR           pNonce;
+    CK_ULONG              ulNonceLen;
+    CK_ULONG              ulNonceFixedBits;
+    CK_GENERATOR_FUNCTION nonceGenerator;
+    CK_BYTE_PTR           pMAC;
+    CK_ULONG              ulMACLen;
+} CK_CCM_MESSAGE_PARAMS;
+
+typedef CK_CCM_MESSAGE_PARAMS CK_CCM_MESSAGE_PARAMS_PTR;
+
 /* Deprecated. Use CK_GCM_PARAMS */
 typedef struct CK_AES_GCM_PARAMS {
-  CK_BYTE_PTR pIv;
-  CK_ULONG ulIvLen;
-  CK_ULONG ulIvBits;
-  CK_BYTE_PTR pAAD;
-  CK_ULONG ulAADLen;
-  CK_ULONG ulTagBits;
+    CK_BYTE_PTR pIv;
+    CK_ULONG    ulIvLen;
+    CK_ULONG    ulIvBits;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG    ulAADLen;
+    CK_ULONG    ulTagBits;
 } CK_AES_GCM_PARAMS;
 
 typedef CK_AES_GCM_PARAMS CK_PTR CK_AES_GCM_PARAMS_PTR;
 
 /* Deprecated. Use CK_CCM_PARAMS */
 typedef struct CK_AES_CCM_PARAMS {
-    CK_ULONG          ulDataLen;
-    CK_BYTE_PTR       pNonce;
-    CK_ULONG          ulNonceLen;
-    CK_BYTE_PTR       pAAD;
-    CK_ULONG          ulAADLen;
-    CK_ULONG          ulMACLen;
+    CK_ULONG    ulDataLen;
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceLen;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG    ulAADLen;
+    CK_ULONG    ulMACLen;
 } CK_AES_CCM_PARAMS;
 
 typedef CK_AES_CCM_PARAMS CK_PTR CK_AES_CCM_PARAMS_PTR;
 
 typedef struct CK_CAMELLIA_CTR_PARAMS {
-    CK_ULONG          ulCounterBits;
-    CK_BYTE           cb[16];
+    CK_ULONG ulCounterBits;
+    CK_BYTE  cb[16];
 } CK_CAMELLIA_CTR_PARAMS;
 
 typedef CK_CAMELLIA_CTR_PARAMS CK_PTR CK_CAMELLIA_CTR_PARAMS_PTR;
 
 typedef struct CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE           iv[16];
-    CK_BYTE_PTR       pData;
-    CK_ULONG          length;
+    CK_BYTE     iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG    length;
 } CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
-                                CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
+        CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 typedef struct CK_ARIA_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE           iv[16];
-    CK_BYTE_PTR       pData;
-    CK_ULONG          length;
+    CK_BYTE     iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG    length;
 } CK_ARIA_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
-                                CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
+        CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 typedef struct CK_DSA_PARAMETER_GEN_PARAM {
-    CK_MECHANISM_TYPE  hash;
-    CK_BYTE_PTR        pSeed;
-    CK_ULONG           ulSeedLen;
-    CK_ULONG           ulIndex;
+    CK_MECHANISM_TYPE hash;
+    CK_BYTE_PTR       pSeed;
+    CK_ULONG          ulSeedLen;
+    CK_ULONG          ulIndex;
 } CK_DSA_PARAMETER_GEN_PARAM;
 
 typedef CK_DSA_PARAMETER_GEN_PARAM CK_PTR CK_DSA_PARAMETER_GEN_PARAM_PTR;
 
 typedef struct CK_ECDH_AES_KEY_WRAP_PARAMS {
-    CK_ULONG           ulAESKeyBits;
-    CK_EC_KDF_TYPE     kdf;
-    CK_ULONG           ulSharedDataLen;
-    CK_BYTE_PTR        pSharedData;
+    CK_ULONG       ulAESKeyBits;
+    CK_EC_KDF_TYPE kdf;
+    CK_ULONG       ulSharedDataLen;
+    CK_BYTE_PTR    pSharedData;
 } CK_ECDH_AES_KEY_WRAP_PARAMS;
 
 typedef CK_ECDH_AES_KEY_WRAP_PARAMS CK_PTR CK_ECDH_AES_KEY_WRAP_PARAMS_PTR;
@@ -1923,80 +2158,287 @@
 typedef CK_ULONG CK_CERTIFICATE_CATEGORY;
 
 typedef struct CK_RSA_AES_KEY_WRAP_PARAMS {
-    CK_ULONG                      ulAESKeyBits;
-    CK_RSA_PKCS_OAEP_PARAMS_PTR   pOAEPParams;
+    CK_ULONG                    ulAESKeyBits;
+    CK_RSA_PKCS_OAEP_PARAMS_PTR pOAEPParams;
 } CK_RSA_AES_KEY_WRAP_PARAMS;
 
 typedef CK_RSA_AES_KEY_WRAP_PARAMS CK_PTR CK_RSA_AES_KEY_WRAP_PARAMS_PTR;
 
 typedef struct CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
-    CK_SSL3_RANDOM_DATA       RandomInfo;
-    CK_VERSION_PTR            pVersion;
-    CK_MECHANISM_TYPE         prfHashMechanism;
+    CK_SSL3_RANDOM_DATA RandomInfo;
+    CK_VERSION_PTR      pVersion;
+    CK_MECHANISM_TYPE   prfHashMechanism;
 } CK_TLS12_MASTER_KEY_DERIVE_PARAMS;
 
 typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR \
-                                CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
+        CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
 
 typedef struct CK_TLS12_KEY_MAT_PARAMS {
-    CK_ULONG                  ulMacSizeInBits;
-    CK_ULONG                  ulKeySizeInBits;
-    CK_ULONG                  ulIVSizeInBits;
-    CK_BBOOL                  bIsExport;
-    CK_SSL3_RANDOM_DATA       RandomInfo;
-    CK_SSL3_KEY_MAT_OUT_PTR   pReturnedKeyMaterial;
-    CK_MECHANISM_TYPE         prfHashMechanism;
+    CK_ULONG                ulMacSizeInBits;
+    CK_ULONG                ulKeySizeInBits;
+    CK_ULONG                ulIVSizeInBits;
+    CK_BBOOL                bIsExport;
+    CK_SSL3_RANDOM_DATA     RandomInfo;
+    CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+    CK_MECHANISM_TYPE       prfHashMechanism;
 } CK_TLS12_KEY_MAT_PARAMS;
 
 typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR;
 
 typedef struct CK_TLS_KDF_PARAMS {
-    CK_MECHANISM_TYPE         prfMechanism;
-    CK_BYTE_PTR               pLabel;
-    CK_ULONG                  ulLabelLength;
-    CK_SSL3_RANDOM_DATA       RandomInfo;
-    CK_BYTE_PTR               pContextData;
-    CK_ULONG                  ulContextDataLength;
+    CK_MECHANISM_TYPE   prfMechanism;
+    CK_BYTE_PTR         pLabel;
+    CK_ULONG            ulLabelLength;
+    CK_SSL3_RANDOM_DATA RandomInfo;
+    CK_BYTE_PTR         pContextData;
+    CK_ULONG            ulContextDataLength;
 } CK_TLS_KDF_PARAMS;
 
 typedef CK_TLS_KDF_PARAMS CK_PTR CK_TLS_KDF_PARAMS_PTR;
 
 typedef struct CK_TLS_MAC_PARAMS {
-    CK_MECHANISM_TYPE         prfMechanism;
-    CK_ULONG                  ulMacLength;
-    CK_ULONG                  ulServerOrClient;
+    CK_MECHANISM_TYPE prfHashMechanism;
+    CK_ULONG          ulMacLength;
+    CK_ULONG          ulServerOrClient;
 } CK_TLS_MAC_PARAMS;
 
 typedef CK_TLS_MAC_PARAMS CK_PTR CK_TLS_MAC_PARAMS_PTR;
 
 typedef struct CK_GOSTR3410_DERIVE_PARAMS {
-    CK_EC_KDF_TYPE            kdf;
-    CK_BYTE_PTR               pPublicData;
-    CK_ULONG                  ulPublicDataLen;
-    CK_BYTE_PTR               pUKM;
-    CK_ULONG                  ulUKMLen;
+    CK_EC_KDF_TYPE kdf;
+    CK_BYTE_PTR    pPublicData;
+    CK_ULONG       ulPublicDataLen;
+    CK_BYTE_PTR    pUKM;
+    CK_ULONG       ulUKMLen;
 } CK_GOSTR3410_DERIVE_PARAMS;
 
 typedef CK_GOSTR3410_DERIVE_PARAMS CK_PTR CK_GOSTR3410_DERIVE_PARAMS_PTR;
 
 typedef struct CK_GOSTR3410_KEY_WRAP_PARAMS {
-    CK_BYTE_PTR               pWrapOID;
-    CK_ULONG                  ulWrapOIDLen;
-    CK_BYTE_PTR               pUKM;
-    CK_ULONG                  ulUKMLen;
-    CK_OBJECT_HANDLE          hKey;
+    CK_BYTE_PTR      pWrapOID;
+    CK_ULONG         ulWrapOIDLen;
+    CK_BYTE_PTR      pUKM;
+    CK_ULONG         ulUKMLen;
+    CK_OBJECT_HANDLE hKey;
 } CK_GOSTR3410_KEY_WRAP_PARAMS;
 
 typedef CK_GOSTR3410_KEY_WRAP_PARAMS CK_PTR CK_GOSTR3410_KEY_WRAP_PARAMS_PTR;
 
 typedef struct CK_SEED_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE                   iv[16];
-    CK_BYTE_PTR               pData;
-    CK_ULONG                  length;
+    CK_BYTE     iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG    length;
 } CK_SEED_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_SEED_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
-                                        CK_SEED_CBC_ENCRYPT_DATA_PARAMS_PTR;
+        CK_SEED_CBC_ENCRYPT_DATA_PARAMS_PTR;
+
+/*
+ * New PKCS 11 v3.0 data structures.
+ */
+
+typedef CK_ULONG CK_PROFILE_ID;
+typedef CK_PROFILE_ID CK_PTR CK_PROFILE_ID_PTR;
+
+/* Typedefs for Flexible KDF */
+typedef CK_ULONG CK_PRF_DATA_TYPE;
+typedef CK_MECHANISM_TYPE CK_SP800_108_PRF_TYPE;
+#define CK_SP800_108_ITERATION_VARIABLE 0x00000001UL
+#define CK_SP800_108_OPTIONAL_COUNTER   0x00000002UL
+#define CK_SP800_108_DKM_LENGTH         0x00000003UL
+#define CK_SP800_108_BYTE_ARRAY         0x00000004UL
+#define CK_SP800_108_COUNTER            CK_SP800_108_OPTIONAL_COUNTER
+
+typedef struct CK_PRF_DATA_PARAM
+{
+    CK_PRF_DATA_TYPE type;
+    CK_VOID_PTR      pValue;
+    CK_ULONG         ulValueLen;
+} CK_PRF_DATA_PARAM;
+
+typedef CK_PRF_DATA_PARAM CK_PTR CK_PRF_DATA_PARAM_PTR;
+
+
+typedef struct CK_SP800_108_COUNTER_FORMAT
+{
+    CK_BBOOL bLittleEndian;
+    CK_ULONG ulWidthInBits;
+} CK_SP800_108_COUNTER_FORMAT;
+
+typedef CK_SP800_108_COUNTER_FORMAT CK_PTR CK_SP800_108_COUNTER_FORMAT_PTR;
+
+typedef CK_ULONG CK_SP800_108_DKM_LENGTH_METHOD;
+#define CK_SP800_108_DKM_LENGTH_SUM_OF_KEYS     0x00000001UL
+#define CK_SP800_108_DKM_LENGTH_SUM_OF_SEGMENTS 0x00000002UL
+
+typedef struct CK_SP800_108_DKM_LENGTH_FORMAT
+{
+    CK_SP800_108_DKM_LENGTH_METHOD dkmLengthMethod;
+    CK_BBOOL                       bLittleEndian;
+    CK_ULONG                       ulWidthInBits;
+} CK_SP800_108_DKM_LENGTH_FORMAT;
+
+typedef CK_SP800_108_DKM_LENGTH_FORMAT \
+        CK_PTR CK_SP800_108_DKM_LENGTH_FORMAT_PTR;
+
+typedef struct CK_DERIVED_KEY
+{
+    CK_ATTRIBUTE_PTR     pTemplate;
+    CK_ULONG             ulAttributeCount;
+    CK_OBJECT_HANDLE_PTR phKey;
+} CK_DERIVED_KEY;
+
+typedef CK_DERIVED_KEY CK_PTR CK_DERIVED_KEY_PTR;
+
+typedef struct CK_SP800_108_KDF_PARAMS
+{
+    CK_SP800_108_PRF_TYPE prfType;
+    CK_ULONG              ulNumberOfDataParams;
+    CK_PRF_DATA_PARAM_PTR pDataParams;
+    CK_ULONG              ulAdditionalDerivedKeys;
+    CK_DERIVED_KEY_PTR    pAdditionalDerivedKeys;
+} CK_SP800_108_KDF_PARAMS;
+
+typedef CK_SP800_108_KDF_PARAMS CK_PTR CK_SP800_108_KDF_PARAMS_PTR;
+
+typedef struct CK_SP800_108_FEEDBACK_KDF_PARAMS
+{
+    CK_SP800_108_PRF_TYPE prfType;
+    CK_ULONG              ulNumberOfDataParams;
+    CK_PRF_DATA_PARAM_PTR pDataParams;
+    CK_ULONG              ulIVLen;
+    CK_BYTE_PTR           pIV;
+    CK_ULONG              ulAdditionalDerivedKeys;
+    CK_DERIVED_KEY_PTR    pAdditionalDerivedKeys;
+} CK_SP800_108_FEEDBACK_KDF_PARAMS;
+
+typedef CK_SP800_108_FEEDBACK_KDF_PARAMS \
+        CK_PTR CK_SP800_108_FEEDBACK_KDF_PARAMS_PTR;
+
+/* EDDSA */
+typedef struct CK_EDDSA_PARAMS {
+    CK_BBOOL    phFlag;
+    CK_ULONG    ulContextDataLen;
+    CK_BYTE_PTR pContextData;
+} CK_EDDSA_PARAMS;
+
+typedef CK_EDDSA_PARAMS CK_PTR CK_EDDSA_PARAMS_PTR;
+
+/* Extended ChaCha20/Salsa20 support*/
+typedef struct CK_CHACHA20_PARAMS {
+    CK_BYTE_PTR pBlockCounter;
+    CK_ULONG    blockCounterBits;
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceBits;
+} CK_CHACHA20_PARAMS;
+
+typedef CK_CHACHA20_PARAMS CK_PTR CK_CHACHA20_PARAMS_PTR;
+
+typedef struct CK_SALSA20_PARAMS {
+    CK_BYTE_PTR pBlockCounter;
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceBits;
+} CK_SALSA20_PARAMS;
+
+typedef CK_SALSA20_PARAMS CK_PTR CK_SALSA20_PARAMS_PTR;
+
+typedef struct CK_SALSA20_CHACHA20_POLY1305_PARAMS {
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceLen;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG    ulAADLen;
+} CK_SALSA20_CHACHA20_POLY1305_PARAMS;
+
+typedef CK_SALSA20_CHACHA20_POLY1305_PARAMS \
+        CK_PTR CK_SALSA20_CHACHA20_POLY1305_PARAMS_PTR;
+
+typedef struct CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS {
+    CK_BYTE_PTR pNonce;
+    CK_ULONG    ulNonceLen;
+    CK_BYTE_PTR pTag;
+} CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS;
+
+typedef CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS \
+        CK_PTR CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS_PTR;
+
+typedef CK_ULONG CK_X3DH_KDF_TYPE;
+typedef CK_X3DH_KDF_TYPE CK_PTR CK_X3DH_KDF_TYPE_PTR;
+
+/* X3dh, ratchet */
+typedef struct CK_X3DH_INITIATE_PARAMS {
+    CK_X3DH_KDF_TYPE kdf;
+    CK_OBJECT_HANDLE pPeer_identity;
+    CK_OBJECT_HANDLE pPeer_prekey;
+    CK_BYTE_PTR      pPrekey_signature;
+    CK_BYTE_PTR      pOnetime_key;
+    CK_OBJECT_HANDLE pOwn_identity;
+    CK_OBJECT_HANDLE pOwn_ephemeral;
+} CK_X3DH_INITIATE_PARAMS;
+
+typedef struct CK_X3DH_RESPOND_PARAMS {
+    CK_X3DH_KDF_TYPE kdf;
+    CK_BYTE_PTR      pIdentity_id;
+    CK_BYTE_PTR      pPrekey_id;
+    CK_BYTE_PTR      pOnetime_id;
+    CK_OBJECT_HANDLE pInitiator_identity;
+    CK_BYTE_PTR      pInitiator_ephemeral;
+} CK_X3DH_RESPOND_PARAMS;
+
+typedef CK_ULONG CK_X2RATCHET_KDF_TYPE;
+typedef CK_X2RATCHET_KDF_TYPE CK_PTR CK_X2RATCHET_KDF_TYPE_PTR;
+
+typedef struct CK_X2RATCHET_INITIALIZE_PARAMS {
+    CK_BYTE_PTR           sk;
+    CK_OBJECT_HANDLE      peer_public_prekey;
+    CK_OBJECT_HANDLE      peer_public_identity;
+    CK_OBJECT_HANDLE      own_public_identity;
+    CK_BBOOL              bEncryptedHeader;
+    CK_ULONG              eCurve;
+    CK_MECHANISM_TYPE     aeadMechanism;
+    CK_X2RATCHET_KDF_TYPE kdfMechanism;
+} CK_X2RATCHET_INITIALIZE_PARAMS;
+
+typedef CK_X2RATCHET_INITIALIZE_PARAMS \
+        CK_PTR CK_X2RATCHET_INITIALIZE_PARAMS_PTR;
+
+typedef struct CK_X2RATCHET_RESPOND_PARAMS {
+    CK_BYTE_PTR           sk;
+    CK_OBJECT_HANDLE      own_prekey;
+    CK_OBJECT_HANDLE      initiator_identity;
+    CK_OBJECT_HANDLE      own_public_identity;
+    CK_BBOOL              bEncryptedHeader;
+    CK_ULONG              eCurve;
+    CK_MECHANISM_TYPE     aeadMechanism;
+    CK_X2RATCHET_KDF_TYPE kdfMechanism;
+} CK_X2RATCHET_RESPOND_PARAMS;
+typedef CK_X2RATCHET_RESPOND_PARAMS \
+        CK_PTR CK_X2RATCHET_RESPOND_PARAMS_PTR;
+
+typedef CK_ULONG CK_XEDDSA_HASH_TYPE;
+typedef CK_XEDDSA_HASH_TYPE CK_PTR CK_XEDDSA_HASH_TYPE_PTR;
+
+/* XEDDSA */
+typedef struct CK_XEDDSA_PARAMS {
+    CK_XEDDSA_HASH_TYPE hash;
+} CK_XEDDSA_PARAMS;
+typedef CK_XEDDSA_PARAMS CK_PTR CK_XEDDSA_PARAMS_PTR;
+
+typedef struct CK_HKDF_PARAMS {
+    CK_BBOOL          bExtract;
+    CK_BBOOL          bExpand;
+    CK_MECHANISM_TYPE prfHashMechanism;
+    CK_ULONG          ulSaltType;
+    CK_BYTE_PTR       pSalt;
+    CK_ULONG          ulSaltLen;
+    CK_OBJECT_HANDLE  hSaltKey;
+    CK_BYTE_PTR       pInfo;
+    CK_ULONG          ulInfoLen;
+} CK_HKDF_PARAMS;
+typedef CK_HKDF_PARAMS CK_PTR CK_HKDF_PARAMS_PTR;
+
+#define CKF_HKDF_SALT_NULL   0x00000001UL
+#define CKF_HKDF_SALT_DATA   0x00000002UL
+#define CKF_HKDF_SALT_KEY    0x00000004UL
 
 #endif /* _PKCS11T_H_ */
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h	2021-09-01 14:33:15.000000000 +0000
@@ -55,6 +55,9 @@
  * @author Martin Schlaeffer <schlaeff@sbox.tugraz.at>
  */
 
+#ifndef _PKCS11WRAPPER_H
+#define _PKCS11WRAPPER_H 1
+
 /* disable asserts in product mode */
 #ifndef DEBUG
   #ifndef NDEBUG
@@ -156,7 +159,6 @@
 /* include the platform dependent part of the header */
 #include "p11_md.h"
 
-#include "pkcs11.h"
 #include <jni.h>
 #include <jni_util.h>
 
@@ -288,6 +290,10 @@
 #define CLASS_TLS_PRF_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS"
 #define CLASS_TLS_MAC_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS"
 
+/* function to update the CK_NSS_GCM_PARAMS in mechanism pointer with
+ * CK_GCM_PARAMS
+ */
+CK_MECHANISM_PTR updateGCMParams(JNIEnv *env, CK_MECHANISM_PTR mechPtr);
 
 /* function to convert a PKCS#11 return value other than CK_OK into a Java Exception
  * or to throw a PKCS11RuntimeException
@@ -476,3 +482,5 @@
 #define free(c)         (p11free((c), THIS_FILE, __LINE__))
 
 #endif
+
+#endif /* _PKCS11WRAPPER_H */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/back/util_md.h openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/back/util_md.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/back/util_md.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/back/util_md.h	2021-09-01 14:33:15.000000000 +0000
@@ -62,13 +62,13 @@
                    (((UNSIGNED_JINT)(x & 0xff000000)) >> 24))
 #define HOST_TO_JAVA_LONG(x)                                            \
                   ((x << 56) |                                          \
-                   ((x & 0x000000000000ff00) << 40) |                   \
-                   ((x & 0x0000000000ff0000) << 24) |                   \
-                   ((x & 0x00000000ff000000) << 8) |                    \
-                   ((x & 0x000000ff00000000) >> 8) |                    \
-                   ((x & 0x0000ff0000000000) >> 24) |                   \
-                   ((x & 0x00ff000000000000) >> 40) |                   \
-                   (((UNSIGNED_JLONG)(x & 0xff00000000000000)) >> 56))
+                   ((x & 0x000000000000ff00LL) << 40) |                 \
+                   ((x & 0x0000000000ff0000LL) << 24) |                 \
+                   ((x & 0x00000000ff000000LL) << 8) |                  \
+                   ((x & 0x000000ff00000000LL) >> 8) |                  \
+                   ((x & 0x0000ff0000000000LL) >> 24) |                 \
+                   ((x & 0x00ff000000000000LL) >> 40) |                 \
+                   (((UNSIGNED_JLONG)(x & 0xff00000000000000ULL)) >> 56))
 #define HOST_TO_JAVA_FLOAT(x) stream_encodeFloat(x)
 #define HOST_TO_JAVA_DOUBLE(x) stream_encodeDouble(x)
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -399,23 +399,11 @@
         createCompatibleVolatileImage(int width, int height,
                                       int transparency, int type)
     {
-        if (type == FLIP_BACKBUFFER || type == WINDOW || type == UNDEFINED ||
-            transparency == Transparency.BITMASK)
-        {
+        if ((type != FBOBJECT && type != TEXTURE)
+                || transparency == Transparency.BITMASK
+                || type == FBOBJECT && !isCapPresent(CAPS_EXT_FBOBJECT)) {
             return null;
         }
-
-        if (type == FBOBJECT) {
-            if (!isCapPresent(CAPS_EXT_FBOBJECT)) {
-                return null;
-            }
-        } else if (type == PBUFFER) {
-            boolean isOpaque = transparency == Transparency.OPAQUE;
-            if (!isOpaque && !isCapPresent(CAPS_STORED_ALPHA)) {
-                return null;
-            }
-        }
-
         SunVolatileImage vi = new AccelTypedVolatileImage(this, width, height,
                                                           transparency, type);
         Surface sd = vi.getDestSurface();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,11 +30,10 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Rectangle;
-import java.awt.Transparency;
 import java.awt.image.ColorModel;
+
 import sun.awt.X11ComponentPeer;
 import sun.java2d.SurfaceData;
-import sun.java2d.loops.SurfaceType;
 
 public abstract class GLXSurfaceData extends OGLSurfaceData {
 
@@ -43,9 +42,6 @@
 
     private native void initOps(OGLGraphicsConfig gc, X11ComponentPeer peer,
                                 long aData);
-    protected native boolean initPbuffer(long pData, long pConfigInfo,
-                                         boolean isOpaque,
-                                         int width, int height);
 
     protected GLXSurfaceData(X11ComponentPeer peer, GLXGraphicsConfig gc,
                              ColorModel cm, int type)
@@ -92,7 +88,7 @@
 
     /**
      * Creates a SurfaceData object representing an off-screen buffer (either
-     * a Pbuffer or Texture).
+     * a FBO or Texture).
      */
     public static GLXOffScreenSurfaceData createData(GLXGraphicsConfig gc,
                                                      int width, int height,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -43,7 +43,7 @@
 
 public class GLXVolatileSurfaceManager extends VolatileSurfaceManager {
 
-    private boolean accelerationEnabled;
+    private final boolean accelerationEnabled;
 
     public GLXVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
         super(vImg, context);
@@ -51,18 +51,13 @@
         /*
          * We will attempt to accelerate this image only under the
          * following conditions:
-         *   - the image is opaque OR
-         *   - the image is translucent AND
-         *       - the GraphicsConfig supports the FBO extension OR
-         *       - the GraphicsConfig has a stored alpha channel
+         *   - the image is not bitmask AND the GraphicsConfig supports the FBO
+         *     extension
          */
         int transparency = vImg.getTransparency();
-        GLXGraphicsConfig gc = (GLXGraphicsConfig)vImg.getGraphicsConfig();
-        accelerationEnabled =
-            (transparency == Transparency.OPAQUE) ||
-            ((transparency == Transparency.TRANSLUCENT) &&
-             (gc.isCapPresent(CAPS_EXT_FBOBJECT) ||
-              gc.isCapPresent(CAPS_STORED_ALPHA)));
+        GLXGraphicsConfig gc = (GLXGraphicsConfig) vImg.getGraphicsConfig();
+        accelerationEnabled = gc.isCapPresent(CAPS_EXT_FBOBJECT)
+                && transparency != Transparency.BITMASK;
     }
 
     protected boolean isAccelerationEnabled() {
@@ -70,7 +65,7 @@
     }
 
     /**
-     * Create a pbuffer-based SurfaceData object (or init the backbuffer
+     * Create a FBO-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig)
      */
     protected SurfaceData initAcceleratedSurface() {
@@ -110,10 +105,9 @@
                 ColorModel cm = gc.getColorModel(vImg.getTransparency());
                 int type = vImg.getForcedAccelSurfaceType();
                 // if acceleration type is forced (type != UNDEFINED) then
-                // use the forced type, otherwise choose one based on caps
+                // use the forced type, otherwise choose FBOBJECT
                 if (type == OGLSurfaceData.UNDEFINED) {
-                    type = gc.isCapPresent(CAPS_EXT_FBOBJECT) ?
-                        OGLSurfaceData.FBOBJECT : OGLSurfaceData.PBUFFER;
+                    type = OGLSurfaceData.FBOBJECT;
                 }
                 if (createVSynced) {
                     sData = GLXSurfaceData.createData(peer, vImg, type);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/management/OperatingSystemImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/management/OperatingSystemImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/classes/sun/management/OperatingSystemImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/classes/sun/management/OperatingSystemImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -25,8 +25,12 @@
 
 package sun.management;
 
-import jdk.internal.platform.Metrics;
 import java.util.concurrent.TimeUnit;
+import java.util.function.DoubleSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.ToDoubleFunction;
+
+import jdk.internal.platform.Metrics;
 
 /**
  * Implementation class for the operating system.
@@ -40,12 +44,147 @@
 
     private static final int MAX_ATTEMPTS_NUMBER = 10;
     private final Metrics containerMetrics;
+    private ContainerCpuTicks systemLoadTicks = new SystemCpuTicks();
+    private ContainerCpuTicks processLoadTicks = new ProcessCpuTicks();
+
+    private abstract class ContainerCpuTicks {
+        private long usageTicks = 0;
+        private long totalTicks = 0;
+
+        private double getUsageDividesTotal(long usageTicks, long totalTicks) {
+            // If cpu quota or cpu shares are in effect. Calculate the cpu load
+            // based on the following formula (similar to how
+            // getCpuLoad0() is being calculated):
+            //
+            //   | usageTicks - usageTicks' |
+            //  ------------------------------
+            //   | totalTicks - totalTicks' |
+            //
+            // where usageTicks' and totalTicks' are historical values
+            // retrieved via an earlier call of this method.
+            if (usageTicks < 0 || totalTicks <= 0) {
+                return -1;
+            }
+            long distance = usageTicks - this.usageTicks;
+            this.usageTicks = usageTicks;
+            long totalDistance = totalTicks - this.totalTicks;
+            this.totalTicks = totalTicks;
+            double systemLoad = 0.0;
+            if (distance > 0 && totalDistance > 0) {
+                systemLoad = ((double)distance) / totalDistance;
+            }
+            // Ensure the return value is in the range 0.0 -> 1.0
+            systemLoad = Math.max(0.0, systemLoad);
+            systemLoad = Math.min(1.0, systemLoad);
+            return systemLoad;
+        }
+
+        public double getContainerCpuLoad() {
+            assert(containerMetrics != null);
+            long quota = containerMetrics.getCpuQuota();
+            long share = containerMetrics.getCpuShares();
+            if (quota > 0) {
+                long numPeriods = containerMetrics.getCpuNumPeriods();
+                long quotaNanos = TimeUnit.MICROSECONDS.toNanos(quota * numPeriods);
+                return getUsageDividesTotal(cpuUsageSupplier().getAsLong(), quotaNanos);
+            } else if (share > 0) {
+                long hostTicks = getHostTotalCpuTicks0();
+                int totalCPUs = getHostOnlineCpuCount0();
+                int containerCPUs = getAvailableProcessors();
+                // scale the total host load to the actual container cpus
+                hostTicks = hostTicks * containerCPUs / totalCPUs;
+                return getUsageDividesTotal(cpuUsageSupplier().getAsLong(), hostTicks);
+            } else {
+                // If CPU quotas and shares are not active then find the average load for
+                // all online CPUs that are allowed to run this container.
+
+                // If the cpuset is the same as the host's one there is no need to iterate over each CPU
+                if (isCpuSetSameAsHostCpuSet()) {
+                    return defaultCpuLoadSupplier().getAsDouble();
+                } else {
+                    int[] cpuSet = containerMetrics.getEffectiveCpuSetCpus();
+                    // in case the effectiveCPUSetCpus are not available, attempt to use just cpusets.cpus
+                    if (cpuSet == null || cpuSet.length <= 0) {
+                        cpuSet = containerMetrics.getCpuSetCpus();
+                    }
+                    if (cpuSet == null) {
+                        // cgroups is mounted, but CPU resource is not limited.
+                        // We can assume the VM is run on the host CPUs.
+                        return defaultCpuLoadSupplier().getAsDouble();
+                    } else if (cpuSet.length > 0) {
+                        return cpuSetCalc().applyAsDouble(cpuSet);
+                    }
+                    return -1;
+                }
+            }
+        }
+
+        protected abstract DoubleSupplier defaultCpuLoadSupplier();
+        protected abstract ToDoubleFunction<int[]> cpuSetCalc();
+        protected abstract LongSupplier cpuUsageSupplier();
+    }
+
+    private class ProcessCpuTicks extends ContainerCpuTicks {
+
+        @Override
+        protected DoubleSupplier defaultCpuLoadSupplier() {
+            return () -> getProcessCpuLoad0();
+        }
+
+        @Override
+        protected ToDoubleFunction<int[]> cpuSetCalc() {
+            return (int[] cpuSet) -> {
+                int totalCPUs = getHostOnlineCpuCount0();
+                int containerCPUs = getAvailableProcessors();
+                return Math.min(1.0, getProcessCpuLoad0() * totalCPUs / containerCPUs);
+            };
+        }
+
+        @Override
+        protected LongSupplier cpuUsageSupplier() {
+            return () ->  getProcessCpuTime();
+        }
+
+    }
+
+    private class SystemCpuTicks extends ContainerCpuTicks {
+
+        @Override
+        protected DoubleSupplier defaultCpuLoadSupplier() {
+            return () -> getSystemCpuLoad0();
+        }
+
+        @Override
+        protected ToDoubleFunction<int[]> cpuSetCalc() {
+            return (int[] cpuSet) -> {
+                double systemLoad = 0.0;
+                for (int cpu : cpuSet) {
+                    double cpuLoad = getSingleCpuLoad0(cpu);
+                    if (cpuLoad < 0) {
+                        return -1;
+                    }
+                    systemLoad += cpuLoad;
+                }
+                return systemLoad / cpuSet.length;
+            };
+        }
+
+        @Override
+        protected LongSupplier cpuUsageSupplier() {
+            return () -> containerMetrics.getCpuUsage();
+        }
+
+    }
 
     OperatingSystemImpl(VMManagement vm) {
         super(vm);
         this.containerMetrics = jdk.internal.platform.Container.metrics();
     }
 
+    public long getCommittedVirtualMemorySize() {
+        return getCommittedVirtualMemorySize0();
+    }
+
     public long getTotalSwapSpaceSize() {
         if (containerMetrics != null) {
             long limit = containerMetrics.getMemoryAndSwapLimit();
@@ -93,6 +232,10 @@
         return getFreeSwapSpaceSize0();
     }
 
+    public long getProcessCpuTime() {
+        return getProcessCpuTime0();
+    }
+
     public long getFreePhysicalMemorySize() {
         if (containerMetrics != null) {
             long usage = containerMetrics.getMemoryUsage();
@@ -114,71 +257,55 @@
         return getTotalPhysicalMemorySize0();
     }
 
+    public long getOpenFileDescriptorCount() {
+        return getOpenFileDescriptorCount0();
+    }
+
+    public long getMaxFileDescriptorCount() {
+        return getMaxFileDescriptorCount0();
+    }
+
     public double getSystemCpuLoad() {
         if (containerMetrics != null) {
-            long quota = containerMetrics.getCpuQuota();
-            if (quota > 0) {
-                long periodLength = containerMetrics.getCpuPeriod();
-                long numPeriods = containerMetrics.getCpuNumPeriods();
-                long usageNanos = containerMetrics.getCpuUsage();
-                if (periodLength > 0 && numPeriods > 0 && usageNanos > 0) {
-                    long elapsedNanos = TimeUnit.MICROSECONDS.toNanos(periodLength * numPeriods);
-                    double systemLoad = (double) usageNanos / elapsedNanos;
-                    // Ensure the return value is in the range 0.0 -> 1.0
-                    systemLoad = Math.max(0.0, systemLoad);
-                    systemLoad = Math.min(1.0, systemLoad);
-                    return systemLoad;
-                }
-                return -1;
-            } else {
-                // If CPU quotas are not active then find the average system load for
-                // all online CPUs that are allowed to run this container.
-
-                // If the cpuset is the same as the host's one there is no need to iterate over each CPU
-                if (isCpuSetSameAsHostCpuSet()) {
-                    return getSystemCpuLoad0();
-                } else {
-                    int[] cpuSet = containerMetrics.getEffectiveCpuSetCpus();
-                    if (cpuSet != null && cpuSet.length > 0) {
-                        double systemLoad = 0.0;
-                        for (int cpu : cpuSet) {
-                            double cpuLoad = getSingleCpuLoad0(cpu);
-                            if (cpuLoad < 0) {
-                                return -1;
-                            }
-                            systemLoad += cpuLoad;
-                        }
-                        return systemLoad / cpuSet.length;
-                    }
-                    return -1;
-                }
-            }
+            return systemLoadTicks.getContainerCpuLoad();
         }
         return getSystemCpuLoad0();
     }
 
+    public double getProcessCpuLoad() {
+        if (containerMetrics != null) {
+            return processLoadTicks.getContainerCpuLoad();
+        }
+        return getProcessCpuLoad0();
+    }
+
     private boolean isCpuSetSameAsHostCpuSet() {
         if (containerMetrics != null) {
-            return containerMetrics.getCpuSetCpus().length == getHostConfiguredCpuCount0();
+            return containerMetrics.getCpuSetCpus().length == getHostOnlineCpuCount0();
         }
         return false;
     }
 
-    public native long getCommittedVirtualMemorySize();
-    private native long getTotalSwapSpaceSize0();
-    private native long getFreeSwapSpaceSize0();
-    public native long getProcessCpuTime();
+    /* native methods */
+    private native long getCommittedVirtualMemorySize0();
     private native long getFreePhysicalMemorySize0();
-    private native long getTotalPhysicalMemorySize0();
-    public native long getOpenFileDescriptorCount();
-    public native long getMaxFileDescriptorCount();
+    private native long getFreeSwapSpaceSize0();
+    private native long getMaxFileDescriptorCount0();
+    private native long getOpenFileDescriptorCount0();
+    private native long getProcessCpuTime0();
+    private native double getProcessCpuLoad0();
     private native double getSystemCpuLoad0();
-    public native double getProcessCpuLoad();
+    private native long getTotalPhysicalMemorySize0();
+    private native long getTotalSwapSpaceSize0();
     private native double getSingleCpuLoad0(int cpuNum);
     private native int getHostConfiguredCpuCount0();
+    private native int getHostOnlineCpuCount0();
+    // CPU ticks since boot in nanoseconds
+    private native long getHostTotalCpuTicks0();
 
     static {
-        initialize();
+        initialize0();
     }
-    private static native void initialize();
+
+    private static native void initialize0();
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/java/io/UnixFileSystem_md.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/java/io/UnixFileSystem_md.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/java/io/UnixFileSystem_md.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/java/io/UnixFileSystem_md.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -208,7 +208,13 @@
     WITH_FIELD_PLATFORM_STRING(env, file, ids.path, path) {
         struct stat64 sb;
         if (stat64(path, &sb) == 0) {
-            rv = 1000 * (jlong)sb.st_mtime;
+#ifndef MACOSX
+            rv  = (jlong)sb.st_mtim.tv_sec * 1000;
+            rv += (jlong)sb.st_mtim.tv_nsec / 1000000;
+#else
+            rv  = (jlong)sb.st_mtimespec.tv_sec * 1000;
+            rv += (jlong)sb.st_mtimespec.tv_nsec / 1000000;
+#endif
         }
     } END_PLATFORM_STRING(env, path);
     return rv;
@@ -392,8 +398,13 @@
             struct timeval tv[2];
 
             /* Preserve access time */
-            tv[0].tv_sec = sb.st_atime;
-            tv[0].tv_usec = 0;
+#ifndef MACOSX
+            tv[0].tv_sec = sb.st_atim.tv_sec;
+            tv[0].tv_usec = sb.st_atim.tv_nsec / 1000;
+#else
+            tv[0].tv_sec = sb.st_atimespec.tv_sec;
+            tv[0].tv_usec = sb.st_atimespec.tv_nsec / 1000;
+#endif
 
             /* Change last-modified time */
             tv[1].tv_sec = time / 1000;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/awt/awt_Font.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/awt/awt_Font.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/awt/awt_Font.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/awt/awt_Font.c	2021-09-01 14:33:15.000000000 +0000
@@ -454,6 +454,7 @@
         int32_t i, size;
         char *fontsetname = NULL;
         char *nativename = NULL;
+        Boolean doFree = FALSE;
         jobjectArray componentFonts = NULL;
         jobject peer = NULL;
         jobject fontDescriptor = NULL;
@@ -493,8 +494,10 @@
 
             if (!JNU_IsNull(env, fontDescriptorName)) {
                 nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
+                doFree = TRUE;
             } else {
                 nativename = "";
+                doFree = FALSE;
             }
 
             fdata->flist[i].xlfd = malloc(strlen(nativename)
@@ -502,7 +505,7 @@
             jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
                          nativename, size * 10);
 
-            if (nativename != NULL && nativename != "")
+            if (nativename != NULL && doFree)
                 JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
 
             /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -472,7 +472,7 @@
     GLXPbuffer scratch;
     GLXGraphicsConfigInfo *glxinfo;
     jint caps = CAPS_EMPTY;
-    int db, alpha;
+    int db;
     const unsigned char *versionstr;
 
     J2dRlsTraceLn(J2D_TRACE_INFO, "GLXGraphicsConfig_getGLXConfigInfo");
@@ -583,10 +583,6 @@
     if (db) {
         caps |= CAPS_DOUBLEBUFFERED;
     }
-    j2d_glXGetFBConfigAttrib(awt_display, fbconfig, GLX_ALPHA_SIZE, &alpha);
-    if (alpha > 0) {
-        caps |= CAPS_STORED_ALPHA;
-    }
 
     // initialize the OGLContext, which wraps the GLXFBConfig and GLXContext
     oglc = GLXGC_InitOGLContext(fbconfig, context, scratch, caps);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	2021-09-01 14:33:15.000000000 +0000
@@ -120,25 +120,13 @@
 
 /**
  * This function disposes of any native windowing system resources associated
- * with this surface.  For instance, if the given OGLSDOps is of type
- * OGLSD_PBUFFER, this method implementation will destroy the actual pbuffer
- * surface.
+ * with this surface.
  */
 void
 OGLSD_DestroyOGLSurface(JNIEnv *env, OGLSDOps *oglsdo)
 {
-    GLXSDOps *glxsdo = (GLXSDOps *)oglsdo->privOps;
-
     J2dTraceLn(J2D_TRACE_INFO, "OGLSD_DestroyOGLSurface");
-
-    if (oglsdo->drawableType == OGLSD_PBUFFER) {
-        if (glxsdo->drawable != 0) {
-            j2d_glXDestroyPbuffer(awt_display, glxsdo->drawable);
-            glxsdo->drawable = 0;
-        }
-    } else if (oglsdo->drawableType == OGLSD_WINDOW) {
-        // X Window is free'd later by AWT code...
-    }
+    // X Window is free'd later by AWT code...
 }
 
 /**
@@ -334,74 +322,6 @@
     return 0;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer
-    (JNIEnv *env, jobject glxsd,
-     jlong pData, jlong pConfigInfo,
-     jboolean isOpaque,
-     jint width, jint height)
-{
-    OGLSDOps *oglsdo = (OGLSDOps *)jlong_to_ptr(pData);
-    GLXGraphicsConfigInfo *glxinfo =
-        (GLXGraphicsConfigInfo *)jlong_to_ptr(pConfigInfo);
-    GLXSDOps *glxsdo;
-    GLXPbuffer pbuffer;
-    int attrlist[] = {GLX_PBUFFER_WIDTH, 0,
-                      GLX_PBUFFER_HEIGHT, 0,
-                      GLX_PRESERVED_CONTENTS, GL_FALSE, 0};
-
-    J2dTraceLn3(J2D_TRACE_INFO,
-                "GLXSurfaceData_initPbuffer: w=%d h=%d opq=%d",
-                width, height, isOpaque);
-
-    if (oglsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-                      "GLXSurfaceData_initPbuffer: ops are null");
-        return JNI_FALSE;
-    }
-
-    glxsdo = (GLXSDOps *)oglsdo->privOps;
-    if (glxsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-                      "GLXSurfaceData_initPbuffer: glx ops are null");
-        return JNI_FALSE;
-    }
-
-    if (glxinfo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-                      "GLXSurfaceData_initPbuffer: glx config info is null");
-        return JNI_FALSE;
-    }
-
-    attrlist[1] = width;
-    attrlist[3] = height;
-
-    surfaceCreationFailed = JNI_FALSE;
-    EXEC_WITH_XERROR_HANDLER(
-        GLXSD_BadAllocXErrHandler,
-        pbuffer = j2d_glXCreatePbuffer(awt_display,
-                                       glxinfo->fbconfig, attrlist));
-    if ((pbuffer == 0) || surfaceCreationFailed) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "GLXSurfaceData_initPbuffer: could not create glx pbuffer");
-        return JNI_FALSE;
-    }
-
-    oglsdo->drawableType = OGLSD_PBUFFER;
-    oglsdo->isOpaque = isOpaque;
-    oglsdo->width = width;
-    oglsdo->height = height;
-    oglsdo->xOffset = 0;
-    oglsdo->yOffset = 0;
-
-    glxsdo->drawable = pbuffer;
-    glxsdo->xdrawable = 0;
-
-    OGLSD_SetNativeDimensions(env, oglsdo, width, height);
-
-    return JNI_TRUE;
-}
-
 void
 OGLSD_SwapBuffers(JNIEnv *env, jlong window)
 {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/x11/X11SurfaceData.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	2021-09-01 14:33:15.000000000 +0000
@@ -545,7 +545,7 @@
     xsdo->cData = xsdo->configData->color_data;
 
     XShared_initSurface(env, xsdo, depth, width, height, drawable);
-    xsdo->xrPic = NULL;
+    xsdo->xrPic = None;
 #endif /* !HEADLESS */
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/LinuxOperatingSystem.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/LinuxOperatingSystem.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/LinuxOperatingSystem.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/LinuxOperatingSystem.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, 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
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <pthread.h>
+#include <inttypes.h>
 #include "sun_management_OperatingSystemImpl.h"
 
 struct ticks {
@@ -57,7 +58,8 @@
     ticks *cpus;
 } counters;
 
-#define DEC_64 "%lld"
+#define DEC_64 "%"SCNd64
+#define NS_PER_SEC 1000000000
 
 static void next_line(FILE *f) {
     while (fgetc(f) != '\n');
@@ -333,7 +335,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad
+Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
 (JNIEnv *env, jobject dummy)
 {
     if (perfInit() == 0) {
@@ -364,3 +366,39 @@
        return -1;
     }
 }
+
+// Return the host cpu ticks since boot in nanoseconds
+JNIEXPORT jlong JNICALL
+Java_sun_management_OperatingSystemImpl_getHostTotalCpuTicks0
+(JNIEnv *env, jobject mbean)
+{
+    if (perfInit() == 0) {
+        if (get_totalticks(-1, &counters.cpuTicks) < 0) {
+            return -1;
+        } else {
+            long ticks_per_sec = sysconf(_SC_CLK_TCK);
+            jlong result = (jlong)counters.cpuTicks.total;
+            if (ticks_per_sec <= NS_PER_SEC) {
+                long scale_factor = NS_PER_SEC/ticks_per_sec;
+                result = result * scale_factor;
+            } else {
+                long scale_factor = ticks_per_sec/NS_PER_SEC;
+                result = result / scale_factor;
+            }
+            return result;
+        }
+    } else {
+        return -1;
+    }
+}
+
+JNIEXPORT jint JNICALL
+Java_sun_management_OperatingSystemImpl_getHostOnlineCpuCount0
+(JNIEnv *env, jobject mbean)
+{
+    int n = sysconf(_SC_NPROCESSORS_ONLN);
+    if (n <= 0) {
+        n = 1;
+    }
+    return n;
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/MacosxOperatingSystem.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/MacosxOperatingSystem.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/MacosxOperatingSystem.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/MacosxOperatingSystem.c	2021-09-01 14:33:15.000000000 +0000
@@ -29,6 +29,7 @@
 #include <mach/mach.h>
 #include <mach/task_info.h>
 
+#include "jvm.h"
 
 JNIEXPORT jdouble JNICALL
 Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
@@ -83,7 +84,7 @@
 
 
 JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad
+Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
 (JNIEnv *env, jobject dummy)
 {
     // This code is influenced by the darwin top source
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/OperatingSystemImpl.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/OperatingSystemImpl.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/OperatingSystemImpl.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/OperatingSystemImpl.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -179,14 +179,14 @@
 }
 
 JNIEXPORT void JNICALL
-Java_sun_management_OperatingSystemImpl_initialize
+Java_sun_management_OperatingSystemImpl_initialize0
   (JNIEnv *env, jclass cls)
 {
     page_size = sysconf(_SC_PAGESIZE);
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize
+Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0
   (JNIEnv *env, jobject mbean)
 {
 #ifdef __solaris__
@@ -267,7 +267,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuTime
+Java_sun_management_OperatingSystemImpl_getProcessCpuTime0
   (JNIEnv *env, jobject mbean)
 {
 #ifdef __APPLE__
@@ -374,7 +374,7 @@
 
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount
+Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount0
   (JNIEnv *env, jobject mbean)
 {
 #ifdef __APPLE__
@@ -476,10 +476,24 @@
 {
     return -1;
 }
+
+JNIEXPORT jint JNICALL
+Java_sun_management_OperatingSystemImpl_getHostOnlineCpuCount0
+(JNIEnv *env, jobject mbean)
+{
+    return -1;
+}
+
+JNIEXPORT jlong JNICALL
+Java_sun_management_OperatingSystemImpl_getHostTotalCpuTicks0
+(JNIEnv *env, jobject mbean)
+{
+    return -1;
+}
 #endif
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount
+Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount0
   (JNIEnv *env, jobject mbean)
 {
     struct rlimit rlp;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/SolarisOperatingSystem.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/SolarisOperatingSystem.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/management/SolarisOperatingSystem.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/management/SolarisOperatingSystem.c	2021-09-01 14:33:15.000000000 +0000
@@ -233,7 +233,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad
+Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
 (JNIEnv *env, jobject dummy)
 {
     return get_process_load();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/j2secmod_md.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2021-09-01 14:33:15.000000000 +0000
@@ -32,6 +32,7 @@
 #include <jni_util.h>
 
 #include "j2secmod.h"
+#include "wrapper/pkcs11wrapper.h"
 
 void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     void *hModule = (void*)jlong_to_ptr(jHandle);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
@@ -56,6 +60,9 @@
 
 /* defines for UNIX platforms *************************************************/
 
+#ifndef _P11_MD_H
+#define _P11_MD_H 1
+
 #define CK_PTR *
 #define CK_DEFINE_FUNCTION(returnType, name) returnType name
 #define CK_DECLARE_FUNCTION(returnType, name) returnType name
@@ -66,6 +73,7 @@
 #endif
 
 #include "pkcs11.h"
+#include "pkcs11gcm2.h"
 
 #include "jni.h"
 
@@ -83,3 +91,5 @@
 
 };
 typedef struct ModuleData ModuleData;
+
+#endif  /* _P11_MD_H */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/xawt/XToolkit.c openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/xawt/XToolkit.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/solaris/native/sun/xawt/XToolkit.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/solaris/native/sun/xawt/XToolkit.c	2021-09-01 14:33:15.000000000 +0000
@@ -716,7 +716,7 @@
     if (pollFds[0].revents) {
         // Events in X pipe
         update_poll_timeout(TIMEOUT_EVENTS);
-        PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %ld \n", curPollTimeout);
+        PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %d \n", curPollTimeout);
     }
     return TRUE;
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/back/linker_md.c openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/back/linker_md.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/back/linker_md.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/back/linker_md.c	2021-09-01 14:33:15.000000000 +0000
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <errno.h>
 #include <io.h>
+#include <stdlib.h>
 
 #include "sys.h"
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/back/proc_md.h openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/back/proc_md.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/back/proc_md.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/back/proc_md.h	2021-09-01 14:33:15.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include <process.h>
 #include <time.h>
+#include <Windows.h>
 
 #define MUTEX_T         int
 #define MUTEX_INIT      0
@@ -40,4 +41,4 @@
 
 #define popen   _popen
 #define pclose  _pclose
-#define sleep   _sleep
+#define sleep(s)  Sleep((s)*1000)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/com/sun/java/accessibility/AccessBridge.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/com/sun/java/accessibility/AccessBridge.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/com/sun/java/accessibility/AccessBridge.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/com/sun/java/accessibility/AccessBridge.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -1550,38 +1550,6 @@
         return null;
     }
 
-    private int getNonVisibleChildrenCountTillIndex(AccessibleContext parentAC, int index) {
-        if (parentAC != null && index >= 0 && index < parentAC.getAccessibleChildrenCount()) {
-            int nonVisibleChildrenCount = 0;
-            for (int i = 0; i <= index; i++) {
-                if (!parentAC.getAccessibleChild(i).getAccessibleContext().getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
-                    nonVisibleChildrenCount++;
-                }
-            }
-            return nonVisibleChildrenCount;
-        }
-        return 0;
-    }
-
-    private Accessible getVisibleChildAtIndex(AccessibleContext parentAC, int index) {
-        if (parentAC != null && index >= 0 && index < parentAC.getAccessibleChildrenCount()) {
-            int visibleIndex = -1;
-            int childrenCount = parentAC.getAccessibleChildrenCount();
-            for (int i = 0; i <= childrenCount; i++) {
-                Accessible child = parentAC.getAccessibleChild(i);
-                if (child != null) {
-                    AccessibleContext ac = child.getAccessibleContext();
-                    if (ac != null && ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
-                        visibleIndex++;
-                    }
-                    if (visibleIndex == index) {
-                        return child;
-                    }
-                }
-            }
-        }
-        return null;
-    }
     /**
      * returns the AccessibleParent from an AccessibleContext
      */
@@ -1612,12 +1580,7 @@
         return InvocationUtils.invokeAndWait(new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
-                int indexInParent = ac.getAccessibleIndexInParent();
-                Accessible parent = ac.getAccessibleParent();
-                if (parent != null) {
-                    indexInParent -= getNonVisibleChildrenCountTillIndex(parent.getAccessibleContext(), indexInParent);
-                }
-                return indexInParent;
+                return ac.getAccessibleIndexInParent();
             }
         }, ac);
     }
@@ -1631,8 +1594,7 @@
         return InvocationUtils.invokeAndWait(new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
-                int childrenCount = ac.getAccessibleChildrenCount();
-                return childrenCount - getNonVisibleChildrenCountTillIndex(ac, childrenCount - 1);
+                return ac.getAccessibleChildrenCount();
             }
         }, ac);
     }
@@ -1668,7 +1630,7 @@
             return InvocationUtils.invokeAndWait(new Callable<AccessibleContext>() {
                 @Override
                 public AccessibleContext call() throws Exception {
-                    Accessible a = getVisibleChildAtIndex(ac, index);
+                    Accessible a = ac.getAccessibleChild(index);
                     if (a != null) {
                         return a.getAccessibleContext();
                     }
@@ -3653,11 +3615,7 @@
                         AccessibleRelation[] relations = ars.toArray();
                         if (relations != null && i >= 0 && i < relations.length) {
                             Object[] targets = relations[i].getTarget();
-                            if (targets != null) {
-                                int targetCount = targets.length -
-                                        getNonVisibleTargetCountTillIndex(targets, targets.length - 1);
-                                return targetCount;
-                            }
+                            return targets.length;
                         }
                     }
                 }
@@ -3683,7 +3641,7 @@
                         if (relations != null && i >= 0 && i < relations.length) {
                             Object[] targets = relations[i].getTarget();
                             if (targets != null && j >= 0 & j < targets.length) {
-                                Object o = getVisibleTargetAtIndex(targets, j);
+                                Object o = targets[j];
                                 if (o instanceof Accessible) {
                                     return ((Accessible) o).getAccessibleContext();
                                 }
@@ -3696,40 +3654,6 @@
         }, ac);
     }
 
-    private Object getVisibleTargetAtIndex(Object[] targets, int index) {
-        if (index >= 0 && index < targets.length) {
-            int visibleTargetIndex = -1;
-            for (int i = 0; i < targets.length; i++) {
-                if (targets[i] instanceof Accessible) {
-                    AccessibleContext ac = ((Accessible) targets[i]).getAccessibleContext();
-                    if (ac != null && ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
-                        visibleTargetIndex++;
-                    }
-                    if (visibleTargetIndex == index) {
-                        return targets[i];
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private int getNonVisibleTargetCountTillIndex(Object[] targets, int index) {
-        if (index >= 0 && index < targets.length) {
-            int nonVisibleTargetsCount = 0;
-            for (int i = 0; i <= index; i++) {
-                if (targets[i] instanceof Accessible) {
-                    AccessibleContext ac = ((Accessible) targets[i]).getAccessibleContext();
-                    if (ac != null && !ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
-                        nonVisibleTargetsCount++;
-                    }
-                }
-            }
-            return nonVisibleTargetsCount;
-        }
-        return 0;
-    }
-
     // ========= AccessibleHypertext =========
 
     private Map<AccessibleHypertext, AccessibleContext> hyperTextContextMap = new WeakHashMap<>();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,7 +27,6 @@
 
 import java.awt.AWTException;
 import java.awt.BufferCapabilities;
-import java.awt.BufferCapabilities.FlipContents;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
@@ -428,23 +427,11 @@
         createCompatibleVolatileImage(int width, int height,
                                       int transparency, int type)
     {
-        if (type == FLIP_BACKBUFFER || type == WINDOW || type == UNDEFINED ||
-            transparency == Transparency.BITMASK)
-        {
+        if ((type != FBOBJECT && type != TEXTURE)
+                || transparency == Transparency.BITMASK
+                || type == FBOBJECT && !isCapPresent(CAPS_EXT_FBOBJECT)) {
             return null;
         }
-
-        if (type == FBOBJECT) {
-            if (!isCapPresent(CAPS_EXT_FBOBJECT)) {
-                return null;
-            }
-        } else if (type == PBUFFER) {
-            boolean isOpaque = transparency == Transparency.OPAQUE;
-            if (!isOpaque && !isCapPresent(CAPS_STORED_ALPHA)) {
-                return null;
-            }
-        }
-
         SunVolatileImage vi = new AccelTypedVolatileImage(this, width, height,
                                                           transparency, type);
         Surface sd = vi.getDestSurface();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -43,9 +43,6 @@
 
     private native void initOps(OGLGraphicsConfig gc, long pConfigInfo,
                                 WComponentPeer peer, long hwnd);
-    protected native boolean initPbuffer(long pData, long pConfigInfo,
-                                         boolean isOpaque,
-                                         int width, int height);
 
     protected WGLSurfaceData(WComponentPeer peer, WGLGraphicsConfig gc,
                              ColorModel cm, int type)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -40,10 +40,9 @@
 import sun.java2d.pipe.hw.ExtendedBufferCapabilities;
 import static sun.java2d.pipe.hw.ExtendedBufferCapabilities.VSyncType.*;
 
-public class WGLVolatileSurfaceManager
-    extends VolatileSurfaceManager
-{
-    private boolean accelerationEnabled;
+public class WGLVolatileSurfaceManager extends VolatileSurfaceManager {
+
+    private final boolean accelerationEnabled;
 
     public WGLVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
         super(vImg, context);
@@ -51,18 +50,13 @@
         /*
          * We will attempt to accelerate this image only under the
          * following conditions:
-         *   - the image is opaque OR
-         *   - the image is translucent AND
-         *       - the GraphicsConfig supports the FBO extension OR
-         *       - the GraphicsConfig has a stored alpha channel
+         *   - the image is not bitmask AND the GraphicsConfig supports the FBO
+         *     extension
          */
         int transparency = vImg.getTransparency();
-        WGLGraphicsConfig gc = (WGLGraphicsConfig)vImg.getGraphicsConfig();
-        accelerationEnabled =
-            (transparency == Transparency.OPAQUE) ||
-            ((transparency == Transparency.TRANSLUCENT) &&
-             (gc.isCapPresent(CAPS_EXT_FBOBJECT) ||
-              gc.isCapPresent(CAPS_STORED_ALPHA)));
+        WGLGraphicsConfig gc = (WGLGraphicsConfig) vImg.getGraphicsConfig();
+        accelerationEnabled = gc.isCapPresent(CAPS_EXT_FBOBJECT)
+                && transparency != Transparency.BITMASK;
     }
 
     protected boolean isAccelerationEnabled() {
@@ -70,7 +64,7 @@
     }
 
     /**
-     * Create a pbuffer-based SurfaceData object (or init the backbuffer
+     * Create a FBO-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig).
      */
     protected SurfaceData initAcceleratedSurface() {
@@ -108,10 +102,9 @@
                 ColorModel cm = gc.getColorModel(vImg.getTransparency());
                 int type = vImg.getForcedAccelSurfaceType();
                 // if acceleration type is forced (type != UNDEFINED) then
-                // use the forced type, otherwise choose one based on caps
+                // use the forced type, otherwise choose FBOBJECT
                 if (type == OGLSurfaceData.UNDEFINED) {
-                    type = gc.isCapPresent(CAPS_EXT_FBOBJECT) ?
-                        OGLSurfaceData.FBOBJECT : OGLSurfaceData.PBUFFER;
+                    type = OGLSurfaceData.FBOBJECT;
                 }
                 if (createVSynced) {
                     sData = WGLSurfaceData.createData(peer, vImg, type);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/management/OperatingSystemImpl.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/management/OperatingSystemImpl.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/management/OperatingSystemImpl.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/management/OperatingSystemImpl.java	2021-09-01 14:33:15.000000000 +0000
@@ -50,18 +50,48 @@
             return getCommittedVirtualMemorySize0();
         }
     }
-    private native long getCommittedVirtualMemorySize0();
 
-    public native long getTotalSwapSpaceSize();
-    public native long getFreeSwapSpaceSize();
-    public native long getProcessCpuTime();
-    public native long getFreePhysicalMemorySize();
-    public native long getTotalPhysicalMemorySize();
-    public native double getSystemCpuLoad();
-    public native double getProcessCpuLoad();
+    public long getTotalSwapSpaceSize() {
+        return getTotalSwapSpaceSize0();
+    }
+
+    public long getFreeSwapSpaceSize() {
+        return getFreeSwapSpaceSize0();
+    }
+
+    public long getProcessCpuTime() {
+        return getProcessCpuTime0();
+    }
+
+    public long getFreePhysicalMemorySize() {
+        return getFreePhysicalMemorySize0();
+    }
+
+    public long getTotalPhysicalMemorySize() {
+        return getTotalPhysicalMemorySize0();
+    }
+
+    public double getSystemCpuLoad() {
+        return getSystemCpuLoad0();
+    }
+
+    public double getProcessCpuLoad() {
+        return getProcessCpuLoad0();
+    }
+
+    /* native methods */
+    private native long getCommittedVirtualMemorySize0();
+    private native long getFreePhysicalMemorySize0();
+    private native long getFreeSwapSpaceSize0();
+    private native double getProcessCpuLoad0();
+    private native long getProcessCpuTime0();
+    private native double getSystemCpuLoad0();
+    private native long getTotalPhysicalMemorySize0();
+    private native long getTotalSwapSpaceSize0();
 
     static {
-        initialize();
+        initialize0();
     }
-    private static native void initialize();
+
+    private static native void initialize0();
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/print/PrintServiceLookupProvider.java openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/print/PrintServiceLookupProvider.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/classes/sun/print/PrintServiceLookupProvider.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/classes/sun/print/PrintServiceLookupProvider.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -25,10 +25,8 @@
 
 package sun.print;
 
-import java.security.AccessController;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
+
 import javax.print.DocFlavor;
 import javax.print.MultiDocPrintService;
 import javax.print.PrintService;
@@ -50,31 +48,7 @@
     private String[] printers; /* excludes the default printer */
     private PrintService[] printServices; /* includes the default printer */
 
-    private static final int DEFAULT_REFRESH_TIME = 240;  // 4 minutes
-    private static final int MINIMUM_REFRESH_TIME = 120;  // 2 minutes
-    private static final boolean pollServices;
-    private static final int refreshTime;
-
     static {
-        /* The system property "sun.java2d.print.polling"
-         * can be used to force the printing code to poll or not poll
-         * for PrintServices.
-         */
-        String pollStr = java.security.AccessController.doPrivileged(
-            new sun.security.action.GetPropertyAction("sun.java2d.print.polling"));
-        pollServices = !("false".equalsIgnoreCase(pollStr));
-
-        /* The system property "sun.java2d.print.minRefreshTime"
-         * can be used to specify minimum refresh time (in seconds)
-         * for polling PrintServices.  The default is 240.
-         */
-        String refreshTimeStr = java.security.AccessController.doPrivileged(
-            new sun.security.action.GetPropertyAction(
-                "sun.java2d.print.minRefreshTime"));
-        refreshTime = (refreshTimeStr != null)
-                      ? getRefreshTime(refreshTimeStr)
-                      : DEFAULT_REFRESH_TIME;
-
         java.security.AccessController.doPrivileged(
             new java.security.PrivilegedAction<Void>() {
                 public Void run() {
@@ -84,17 +58,6 @@
             });
     }
 
-    private static int getRefreshTime(final String refreshTimeStr) {
-        try {
-            int minRefreshTime = Integer.parseInt(refreshTimeStr);
-            return (minRefreshTime < MINIMUM_REFRESH_TIME)
-                   ? MINIMUM_REFRESH_TIME
-                   : minRefreshTime;
-        } catch (NumberFormatException e) {
-            return DEFAULT_REFRESH_TIME;
-        }
-    }
-
     /* The singleton win32 print lookup service.
      * Code that is aware of this field and wants to use it must first
      * see if its null, and if so instantiate it by calling a method such as
@@ -120,24 +83,15 @@
         if (win32PrintLUS == null) {
             win32PrintLUS = this;
 
-            String osName = AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction("os.name"));
-            // There's no capability for Win98 to refresh printers.
-            // See "OpenPrinter" for more info.
-            if (osName != null && osName.startsWith("Windows 98")) {
-                return;
-            }
             // start the local printer listener thread
             Thread thr = new PrinterChangeListener();
             thr.setDaemon(true);
             thr.start();
 
-            if (pollServices) {
-                // start the remote printer listener thread
-                Thread remThr = new RemotePrinterChangeListener();
-                remThr.setDaemon(true);
-                remThr.start();
-            }
+            // start the remote printer listener thread
+            Thread remThr = new RemotePrinterChangeListener();
+            remThr.setDaemon(true);
+            remThr.start();
         } /* else condition ought to never happen! */
     }
 
@@ -353,96 +307,21 @@
         return defaultPrintService;
     }
 
-    class PrinterChangeListener extends Thread {
-        long chgObj;
-        PrinterChangeListener() {
-            chgObj = notifyFirstPrinterChange(null);
-        }
-
+    private final class PrinterChangeListener extends Thread {
         public void run() {
-            if (chgObj != -1) {
-                while (true) {
-                    // wait for configuration to change
-                    if (notifyPrinterChange(chgObj) != 0) {
-                        try {
-                            refreshServices();
-                        } catch (SecurityException se) {
-                            break;
-                        }
-                    } else {
-                        notifyClosePrinterChange(chgObj);
-                        break;
-                    }
-                }
-            }
+            notifyLocalPrinterChange(); // busy loop in the native code
         }
     }
 
-    /* Windows provides *PrinterChangeNotification* functions that provides
-       information about printer status changes of the local printers but not
-       network printers.
-       Alternatively, Windows provides a way through which one can get the
-       network printer status changes by using WMI, RegistryKeyChange combination,
-       which is a slightly complex mechanism.
-       The Windows WMI offers an async and sync method to read through registry
-       via the WQL query. The async method is considered dangerous as it leaves
-       open a channel until we close it. But the async method has the advantage of
-       being notified of a change in registry by calling callback without polling for it.
-       The sync method uses the polling mechanism to notify.
-       RegistryValueChange cannot be used in combination with WMI to get registry
-       value change notification because of an error that may be generated because the
-       scope of the query would be too big to handle(at times).
-       Hence an alternative mechanism is chosen via the EnumPrinters by polling for the
-       count of printer status changes(add\remove) and based on it update the printers
-       list.
-    */
-    class RemotePrinterChangeListener extends Thread implements Comparator<String>{
-        RemotePrinterChangeListener() {
-        }
-
-        @Override
-        public int compare(String o1, String o2) {
-            return ((o1 == null)
-                    ? ((o2 == null) ? 0 : 1)
-                    : ((o2 == null) ? -1 : o1.compareTo(o2)));
-        }
-
+    private final class RemotePrinterChangeListener extends Thread {
         @Override
         public void run() {
-            // Init the list of remote printers
-            String[] prevRemotePrinters = getRemotePrintersNames();
-            if (prevRemotePrinters != null) {
-                Arrays.sort(prevRemotePrinters, this);
-            }
-
-            while (true) {
-                try {
-                    Thread.sleep(refreshTime * 1000);
-                } catch (InterruptedException e) {
-                    break;
-                }
-
-                String[] currentRemotePrinters = getRemotePrintersNames();
-                if (currentRemotePrinters != null) {
-                    Arrays.sort(currentRemotePrinters, this);
-                }
-                if (!Arrays.equals(prevRemotePrinters, currentRemotePrinters)) {
-                    // The list of remote printers got updated,
-                    // so update the cached list printers which
-                    // includes both local and network printers
-                    refreshServices();
-
-                    // store the current data for next comparison
-                    prevRemotePrinters = currentRemotePrinters;
-                }
-            }
+            notifyRemotePrinterChange(); // busy loop in the native code
         }
     }
 
     private native String getDefaultPrinterName();
     private native String[] getAllPrinterNames();
-    private native long notifyFirstPrinterChange(String printer);
-    private native void notifyClosePrinterChange(long chgObj);
-    private native int notifyPrinterChange(long chgObj);
-    private native String[] getRemotePrintersNames();
+    private native void notifyLocalPrinterChange();
+    private native void notifyRemotePrinterChange();
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -502,8 +502,8 @@
     const unsigned char *versionstr;
     const char *extstr;
     jint caps = CAPS_EMPTY;
-    int attrKeys[] = { WGL_DOUBLE_BUFFER_ARB, WGL_ALPHA_BITS_ARB };
-    int attrVals[2];
+    int attrKeys[] = { WGL_DOUBLE_BUFFER_ARB};
+    int attrVals[1];
 
     J2dRlsTraceLn(J2D_TRACE_INFO, "WGLGraphicsConfig_getWGLConfigInfo");
 
@@ -624,13 +624,10 @@
     }
 
     // get config-specific capabilities
-    j2d_wglGetPixelFormatAttribivARB(hdc, pixfmt, 0, 2, attrKeys, attrVals);
+    j2d_wglGetPixelFormatAttribivARB(hdc, pixfmt, 0, 1, attrKeys, attrVals);
     if (attrVals[0]) {
         caps |= CAPS_DOUBLEBUFFERED;
     }
-    if (attrVals[1] > 0) {
-        caps |= CAPS_STORED_ALPHA;
-    }
 
     // create the scratch pbuffer
     scratch = j2d_wglCreatePbufferARB(hdc, pixfmt, 1, 1, NULL);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	2021-09-01 14:33:15.000000000 +0000
@@ -124,28 +124,13 @@
 
 /**
  * This function disposes of any native windowing system resources associated
- * with this surface.  For instance, if the given OGLSDOps is of type
- * OGLSD_PBUFFER, this method implementation will destroy the actual pbuffer
- * surface.
+ * with this surface.
  */
 void
 OGLSD_DestroyOGLSurface(JNIEnv *env, OGLSDOps *oglsdo)
 {
-    WGLSDOps *wglsdo = (WGLSDOps *)oglsdo->privOps;
-
     J2dTraceLn(J2D_TRACE_INFO, "OGLSD_DestroyOGLSurface");
-
-    if (oglsdo->drawableType == OGLSD_PBUFFER) {
-        if (wglsdo->pbuffer != 0) {
-            if (wglsdo->pbufferDC != 0) {
-                j2d_wglReleasePbufferDCARB(wglsdo->pbuffer,
-                                           wglsdo->pbufferDC);
-                wglsdo->pbufferDC = 0;
-            }
-            j2d_wglDestroyPbufferARB(wglsdo->pbuffer);
-            wglsdo->pbuffer = 0;
-        }
-    }
+    // Window is free'd later by AWT code...
 }
 
 /**
@@ -266,19 +251,11 @@
     ctxinfo = (WGLCtxInfo *)oglc->ctxInfo;
 
     // get the hdc for the destination surface
-    if (dstOps->drawableType == OGLSD_PBUFFER) {
-        dstHDC = dstWGLOps->pbufferDC;
-    } else {
-        dstHDC = GetDC(dstWGLOps->window);
-    }
+    dstHDC = GetDC(dstWGLOps->window);
 
     // get the hdc for the source surface
-    if (srcOps->drawableType == OGLSD_PBUFFER) {
-        srcHDC = srcWGLOps->pbufferDC;
-    } else {
-        // the source will always be equal to the destination in this case
-        srcHDC = dstHDC;
-    }
+    // the source will always be equal to the destination in this case
+    srcHDC = dstHDC;
 
     // REMIND: in theory we should be able to use wglMakeContextCurrentARB()
     // even when the src/dst surfaces are the same, but this causes problems
@@ -296,9 +273,7 @@
     if (!success) {
         J2dRlsTraceLn(J2D_TRACE_ERROR,
                       "OGLSD_MakeOGLContextCurrent: could not make current");
-        if (dstOps->drawableType != OGLSD_PBUFFER) {
-            ReleaseDC(dstWGLOps->window, dstHDC);
-        }
+        ReleaseDC(dstWGLOps->window, dstHDC);
         return NULL;
     }
 
@@ -309,9 +284,7 @@
         j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
 
-    if (dstOps->drawableType != OGLSD_PBUFFER) {
-        ReleaseDC(dstWGLOps->window, dstHDC);
-    }
+    ReleaseDC(dstWGLOps->window, dstHDC);
 
     return oglc;
 }
@@ -389,141 +362,6 @@
 
     return JNI_TRUE;
 }
-
-JNIEXPORT jboolean JNICALL
-Java_sun_java2d_opengl_WGLSurfaceData_initPbuffer
-    (JNIEnv *env, jobject wglsd,
-     jlong pData, jlong pConfigInfo,
-     jboolean isOpaque,
-     jint width, jint height)
-{
-    int attrKeys[] = {
-        WGL_MAX_PBUFFER_WIDTH_ARB,
-        WGL_MAX_PBUFFER_HEIGHT_ARB,
-    };
-    int attrVals[2];
-    int pbAttrList[] = { 0 };
-    OGLSDOps *oglsdo = (OGLSDOps *)jlong_to_ptr(pData);
-    WGLGraphicsConfigInfo *wglInfo =
-        (WGLGraphicsConfigInfo *)jlong_to_ptr(pConfigInfo);
-    WGLSDOps *wglsdo;
-    HWND hwnd;
-    HDC hdc, pbufferDC;
-    HPBUFFERARB pbuffer;
-    int maxWidth, maxHeight;
-    int actualWidth, actualHeight;
-
-    J2dTraceLn3(J2D_TRACE_INFO,
-                "WGLSurfaceData_initPbuffer: w=%d h=%d opq=%d",
-                width, height, isOpaque);
-
-    if (oglsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: ops are null");
-        return JNI_FALSE;
-    }
-
-    wglsdo = (WGLSDOps *)oglsdo->privOps;
-    if (wglsdo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: wgl ops are null");
-        return JNI_FALSE;
-    }
-
-    if (wglInfo == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: wgl config info is null");
-        return JNI_FALSE;
-    }
-
-    // create a scratch window
-    hwnd = WGLGC_CreateScratchWindow(wglInfo->screen);
-    if (hwnd == 0) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: could not create scratch window");
-        return JNI_FALSE;
-    }
-
-    // get the HDC for the scratch window
-    hdc = GetDC(hwnd);
-    if (hdc == 0) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: could not get dc for scratch window");
-        DestroyWindow(hwnd);
-        return JNI_FALSE;
-    }
-
-    // get the maximum allowable pbuffer dimensions
-    j2d_wglGetPixelFormatAttribivARB(hdc, wglInfo->pixfmt, 0, 2,
-                                     attrKeys, attrVals);
-    maxWidth  = attrVals[0];
-    maxHeight = attrVals[1];
-
-    J2dTraceLn4(J2D_TRACE_VERBOSE,
-                "  desired pbuffer dimensions: w=%d h=%d maxw=%d maxh=%d",
-                width, height, maxWidth, maxHeight);
-
-    // if either dimension is 0 or larger than the maximum, we cannot
-    // allocate a pbuffer with the requested dimensions
-    if (width  == 0 || width  > maxWidth ||
-        height == 0 || height > maxHeight)
-    {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: invalid dimensions");
-        ReleaseDC(hwnd, hdc);
-        DestroyWindow(hwnd);
-        return JNI_FALSE;
-    }
-
-    pbuffer = j2d_wglCreatePbufferARB(hdc, wglInfo->pixfmt,
-                                      width, height, pbAttrList);
-
-    ReleaseDC(hwnd, hdc);
-    DestroyWindow(hwnd);
-
-    if (pbuffer == 0) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: could not create wgl pbuffer");
-        return JNI_FALSE;
-    }
-
-    // note that we get the DC for the pbuffer at creation time, and then
-    // release the DC when the pbuffer is disposed; the WGL_ARB_pbuffer
-    // spec is vague about such things, but from past experience we know
-    // this approach to be more robust than, for example, doing a
-    // Get/ReleasePbufferDC() everytime we make a context current
-    pbufferDC = j2d_wglGetPbufferDCARB(pbuffer);
-    if (pbufferDC == 0) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: could not get dc for pbuffer");
-        j2d_wglDestroyPbufferARB(pbuffer);
-        return JNI_FALSE;
-    }
-
-    // make sure the actual dimensions match those that we requested
-    j2d_wglQueryPbufferARB(pbuffer, WGL_PBUFFER_WIDTH_ARB, &actualWidth);
-    j2d_wglQueryPbufferARB(pbuffer, WGL_PBUFFER_HEIGHT_ARB, &actualHeight);
-
-    if (width != actualWidth || height != actualHeight) {
-        J2dRlsTraceLn2(J2D_TRACE_ERROR,
-            "WGLSurfaceData_initPbuffer: actual (w=%d h=%d) != requested",
-                       actualWidth, actualHeight);
-        j2d_wglReleasePbufferDCARB(pbuffer, pbufferDC);
-        j2d_wglDestroyPbufferARB(pbuffer);
-        return JNI_FALSE;
-    }
-
-    oglsdo->drawableType = OGLSD_PBUFFER;
-    oglsdo->isOpaque = isOpaque;
-    oglsdo->width = width;
-    oglsdo->height = height;
-    wglsdo->pbuffer = pbuffer;
-    wglsdo->pbufferDC = pbufferDC;
-
-    OGLSD_SetNativeDimensions(env, oglsdo, width, height);
-
-    return JNI_TRUE;
-}
 
 void
 OGLSD_SwapBuffers(JNIEnv *env, jlong pPeerData)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2020, 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
@@ -125,9 +125,14 @@
             // First, init the HDC object
             AwtComponent *comp = GDIWindowSurfaceData_GetComp(env, wsdo);
             if (comp == NULL) {
+                // wsdo->invalid is set by GDIWindowSurfaceData_GetComp
                 return;
             }
             hDC = comp->GetDCFromComponent();
+            if (hDC == NULL) {
+                wsdo->invalid = JNI_TRUE;
+                return;
+            }
             if (hDC != NULL && wsdo->device != NULL) {
                 ::SelectObject(hDC, nullbrush);
                 ::SelectObject(hDC, nullpen);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/management/OperatingSystemImpl.c openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/management/OperatingSystemImpl.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/management/OperatingSystemImpl.c	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/management/OperatingSystemImpl.c	2021-09-01 14:33:15.000000000 +0000
@@ -75,7 +75,7 @@
 static void perfInit(void);
 
 JNIEXPORT void JNICALL
-Java_sun_management_OperatingSystemImpl_initialize
+Java_sun_management_OperatingSystemImpl_initialize0
   (JNIEnv *env, jclass cls)
 {
     main_process = GetCurrentProcess();
@@ -95,7 +95,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize
+Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize0
   (JNIEnv *env, jobject mbean)
 {
     MEMORYSTATUSEX ms;
@@ -105,7 +105,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize
+Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize0
   (JNIEnv *env, jobject mbean)
 {
     MEMORYSTATUSEX ms;
@@ -115,7 +115,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuTime
+Java_sun_management_OperatingSystemImpl_getProcessCpuTime0
   (JNIEnv *env, jobject mbean)
 {
 
@@ -134,7 +134,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize
+Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize0
   (JNIEnv *env, jobject mbean)
 {
     MEMORYSTATUSEX ms;
@@ -144,7 +144,7 @@
 }
 
 JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize
+Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize0
   (JNIEnv *env, jobject mbean)
 {
     MEMORYSTATUSEX ms;
@@ -1349,14 +1349,14 @@
 }
 
 JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getSystemCpuLoad
+Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
 (JNIEnv *env, jobject dummy)
 {
     return perfGetCPULoad(-1);
 }
 
 JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad
+Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
 (JNIEnv *env, jobject dummy)
 {
     return perfGetProcessCPULoad();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h	2021-09-01 14:33:15.000000000 +0000
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
@@ -77,6 +81,7 @@
 #endif /* CreateMutex */
 
 #include "pkcs11.h"
+#include "pkcs11gcm2.h"
 
 /* statement according to PKCS11 docu */
 #pragma pack(pop, cryptoki)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/awt_DnDDT.cpp openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/awt_DnDDT.cpp
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/awt_DnDDT.cpp	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/awt_DnDDT.cpp	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -133,6 +133,7 @@
 
 HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
     TRY;
+    AwtToolkit::GetInstance().isInDoDragDropLoop = TRUE;
     if (NULL != m_pIDropTargetHelper) {
         m_pIDropTargetHelper->DragEnter(
             m_window,
@@ -152,6 +153,7 @@
         (IsLocalDnD()  && !IsLocalDataObject(pDataObj)))
     {
         *pdwEffect = retEffect;
+        AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
         return ret;
     }
 
@@ -163,6 +165,7 @@
     }
 
     if (JNU_IsNull(env, m_dtcp) || !JNU_IsNull(env, safe_ExceptionOccurred(env))) {
+        AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
         return ret;
     }
 
@@ -188,10 +191,12 @@
                 env->ExceptionDescribe();
                 env->ExceptionClear();
                 actions = java_awt_dnd_DnDConstants_ACTION_NONE;
+                AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
             }
         } catch (std::bad_alloc&) {
             retEffect = ::convertActionsToDROPEFFECT(actions);
             *pdwEffect = retEffect;
+            AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
             throw;
         }
 
@@ -405,6 +410,7 @@
     m_dropSuccess = success;
     m_dropActions = action;
     AwtToolkit::GetInstance().QuitMessageLoop(AwtToolkit::EXIT_ENCLOSING_LOOP);
+    AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
 }
 
 /**
@@ -1119,6 +1125,7 @@
 
 void AwtDropTarget::DragCleanup(void) {
     UnloadCache();
+    AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE;
 }
 
 BOOL AwtDropTarget::IsLocalDataObject(IDataObject __RPC_FAR *pDataObject) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/awt_PrintControl.cpp openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/awt_PrintControl.cpp
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/awt_PrintControl.cpp	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/awt_PrintControl.cpp	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2020, 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
@@ -696,6 +696,7 @@
             }
             ::GlobalUnlock(pd.hDevNames);
         }
+        JNU_ReleaseStringPlatformChars(env, printerName, getName);
 
         if (!samePrinter) {
             LPTSTR foundPrinter = NULL;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/WPrinterJob.cpp openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/WPrinterJob.cpp
--- openjdk-8-8u292-b10/=unpacked-tar3=/src/windows/native/sun/windows/WPrinterJob.cpp	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/src/windows/native/sun/windows/WPrinterJob.cpp	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, 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
@@ -133,12 +133,25 @@
     jobjectArray nameArray;
 
     try {
-        ::EnumPrinters(flags,
-                       NULL, 4, NULL, 0, &cbNeeded, &cReturned);
-        pPrinterEnum = new BYTE[cbNeeded];
-        ::EnumPrinters(flags,
-                       NULL, 4, pPrinterEnum, cbNeeded, &cbNeeded,
-                       &cReturned);
+        ::EnumPrinters(flags, NULL, 4, NULL,
+                       0, &cbNeeded, &cReturned);
+
+        BOOL bResult;
+        int nCount = 0;
+        do {
+            if (pPrinterEnum != NULL) {
+                delete [] pPrinterEnum;
+            }
+            pPrinterEnum = new BYTE[cbNeeded];
+
+            bResult = ::EnumPrinters(flags, NULL, 4, pPrinterEnum,
+                                     cbNeeded, &cbNeeded, &cReturned);
+        } while (!bResult && ++nCount < 5);
+
+        if (!bResult) {
+            // No printers in case of error
+            cReturned = 0;
+        }
 
         if (cReturned > 0) {
             nameArray = env->NewObjectArray(cReturned, clazz, NULL);
@@ -178,35 +191,21 @@
     return getPrinterNames(env, PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_sun_print_PrintServiceLookupProvider_getRemotePrintersNames(JNIEnv *env,
-                                                                 jobject peer)
-{
-    return getPrinterNames(env, PRINTER_ENUM_CONNECTIONS);
-}
 
+JNIEXPORT void JNICALL
+Java_sun_print_PrintServiceLookupProvider_notifyLocalPrinterChange(JNIEnv *env,
+                                                                   jobject peer)
+{
+    jclass cls = env->GetObjectClass(peer);
+    CHECK_NULL(cls);
+    jmethodID refresh = env->GetMethodID(cls, "refreshServices", "()V");
+    CHECK_NULL(refresh);
 
-JNIEXPORT jlong JNICALL
-Java_sun_print_PrintServiceLookupProvider_notifyFirstPrinterChange(JNIEnv *env,
-                                                                jobject peer,
-                                                                jstring printer) {
     HANDLE hPrinter;
-
-    LPTSTR printerName = NULL;
-    if (printer != NULL) {
-        printerName = (LPTSTR)JNU_GetStringPlatformChars(env,
-                                                         printer,
-                                                         NULL);
-        JNU_ReleaseStringPlatformChars(env, printer, printerName);
+    LPTSTR printerName = NULL; // NULL indicates the local printer server
+    if (!::OpenPrinter(printerName, &hPrinter, NULL)) {
+        return;
     }
-
-    // printerName - "Win NT/2K/XP: If NULL, it indicates the local printer
-    // server" - MSDN.   Win9x : OpenPrinter returns 0.
-    BOOL ret = OpenPrinter(printerName, &hPrinter, NULL);
-    if (!ret) {
-      return (jlong)-1;
-    }
-
     // PRINTER_CHANGE_PRINTER = PRINTER_CHANGE_ADD_PRINTER |
     //                          PRINTER_CHANGE_SET_PRINTER |
     //                          PRINTER_CHANGE_DELETE_PRINTER |
@@ -215,32 +214,54 @@
                                                        PRINTER_CHANGE_PRINTER,
                                                        0,
                                                        NULL);
-    return (chgObj == INVALID_HANDLE_VALUE) ? (jlong)-1 : (jlong)chgObj;
-}
-
-
+    if (chgObj != INVALID_HANDLE_VALUE) {
+        BOOL keepMonitoring;
+        do {
+            keepMonitoring = FALSE;
+            if (WaitForSingleObject(chgObj, INFINITE) == WAIT_OBJECT_0) {
+                DWORD dwChange;
+                keepMonitoring = FindNextPrinterChangeNotification(
+                                                 chgObj, &dwChange, NULL, NULL);
+            }
+            if (keepMonitoring) {
+                env->CallVoidMethod(peer, refresh);
+            }
+        } while (keepMonitoring && !env->ExceptionCheck());
 
-JNIEXPORT void JNICALL
-Java_sun_print_PrintServiceLookupProvider_notifyClosePrinterChange(JNIEnv *env,
-                                                                jobject peer,
-                                                                jlong chgObject) {
-    FindClosePrinterChangeNotification((HANDLE)chgObject);
+        FindClosePrinterChangeNotification(chgObj);
+    }
+    ::ClosePrinter(hPrinter);
 }
 
+JNIEXPORT void JNICALL
+Java_sun_print_PrintServiceLookupProvider_notifyRemotePrinterChange(JNIEnv *env,
+                                                                    jobject peer)
+{
+    jclass cls = env->GetObjectClass(peer);
+    CHECK_NULL(cls);
+    jmethodID refresh = env->GetMethodID(cls, "refreshServices", "()V");
+    CHECK_NULL(refresh);
+
+    HKEY hKey;
+    if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_CURRENT_USER,
+                                      _T("Printers\\Connections"),
+                                      0, KEY_NOTIFY, &hKey)) {
+        return;
+    }
+
+    BOOL keepMonitoring;
+    do {
+        keepMonitoring =
+                ERROR_SUCCESS == RegNotifyChangeKeyValue(hKey, TRUE,
+                                                         REG_NOTIFY_CHANGE_NAME,
+                                                         NULL,
+                                                         FALSE);
+        if (keepMonitoring) {
+            env->CallVoidMethod(peer, refresh);
+        }
+    } while (keepMonitoring && !env->ExceptionCheck());
 
-JNIEXPORT jint JNICALL
-Java_sun_print_PrintServiceLookupProvider_notifyPrinterChange(JNIEnv *env,
-                                                           jobject peer,
-                                                           jlong chgObject) {
-    DWORD dwChange;
-
-    DWORD ret = WaitForSingleObject((HANDLE)chgObject, INFINITE);
-    if (ret == WAIT_OBJECT_0) {
-        return(FindNextPrinterChangeNotification((HANDLE)chgObject,
-                                                  &dwChange, NULL, NULL));
-    } else {
-        return 0;
-    }
+    RegCloseKey(hKey);
 }
 
 
@@ -661,7 +682,7 @@
   }
 
   JNU_ReleaseStringPlatformChars(env, printer, printerName);
-  JNU_ReleaseStringPlatformChars(env, printer, printerPort);
+  JNU_ReleaseStringPlatformChars(env, port, printerPort);
   return resolutionArray;
 }
 
@@ -804,7 +825,7 @@
 
   RESTORE_CONTROLWORD
   JNU_ReleaseStringPlatformChars(env, printer, printerName);
-  JNU_ReleaseStringPlatformChars(env, printer, printerPort);
+  JNU_ReleaseStringPlatformChars(env, port, printerPort);
   return ret;
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/com/sun/jdi/ShellScaffold.sh openjdk-8-8u312-b07/=unpacked-tar3=/test/com/sun/jdi/ShellScaffold.sh
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/com/sun/jdi/ShellScaffold.sh	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/com/sun/jdi/ShellScaffold.sh	2021-09-01 14:33:15.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2017, 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
@@ -267,10 +267,10 @@
          # treat them as control chars on mks (eg \t is tab)
          # Oops; windows mks really seems to want this cat line
          # to start in column 1
-         if [ -w "$SystemRoot" ] ; then
-            tmpFile=$SystemRoot/tmp.$$
-         elif [ -w "$SYSTEMROOT" ] ; then
-            tmpFile=$SYSTEMROOT/tmp.$$
+         if [ -w "$Temp" ] ; then
+            tmpFile=$Temp/tmp.$$
+         elif [ -w "$TEMP" ] ; then
+            tmpFile=$TEMP/tmp.$$
          else
             tmpFile=tmp.$$
          fi
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -67,7 +67,8 @@
     public void performOp(InitialContext ctx) throws NamingException {}
 
     public void handleNamingException(NamingException e, long start, long end) {
-        if (e.getCause() instanceof SocketTimeoutException) {
+        if (e.getCause() instanceof SocketTimeoutException
+                || e.getCause().getCause() instanceof SocketTimeoutException) {
             // SSL connect will timeout via readReply using
             // SocketTimeoutException
             e.printStackTrace();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/demo/zipfs/ReleaseDeflater.java openjdk-8-8u312-b07/=unpacked-tar3=/test/demo/zipfs/ReleaseDeflater.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/demo/zipfs/ReleaseDeflater.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/demo/zipfs/ReleaseDeflater.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2019 Amazon.com, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8234011
+ * @summary Check that jdk.nio.zipfs.ZipFileSystem doesn't cache more than ZipFileSystem.MAX_FLATER Inflater/Deflater objects
+ * @run main ReleaseDeflater
+ * @author Volker Simonis
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.spi.FileSystemProvider;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class ReleaseDeflater {
+    public static void main(String[] args) throws Throwable {
+        Path zipFile = Paths.get("ReleaseDeflaterTest.zip").toAbsolutePath();
+        URI zipURI = URI.create("jar:" + zipFile.toUri());
+        Map<String, String> env = new HashMap<>();
+        env.put("create", "true");
+        try (FileSystem fs = FileSystems.newFileSystem(zipURI, env)) {
+            FileSystemProvider zprov = fs.provider();
+            Path test = fs.getPath("test.txt");
+            int STREAMS = 100;
+            List<OutputStream> ostreams = new ArrayList<>(STREAMS);
+            List<InputStream> istreams = new ArrayList<>(STREAMS);
+            for (int i = 0; i < STREAMS; i++) {
+                OutputStream zos = zprov.newOutputStream(test);
+                ostreams.add(zos);
+                zos.write("Hello".getBytes());
+            }
+            for (OutputStream os : ostreams) {
+                os.close();
+            }
+            for (int i = 0; i < STREAMS; i++) {
+                InputStream zis = zprov.newInputStream(test);
+                istreams.add(zis);
+            }
+            for (InputStream is : istreams) {
+                is.close();
+            }
+            try {
+                Field max_flaters = fs.getClass().getDeclaredField("MAX_FLATER");
+                max_flaters.setAccessible(true);
+                int MAX_FLATERS = max_flaters.getInt(fs);
+                Field inflaters = fs.getClass().getDeclaredField("inflaters");
+                inflaters.setAccessible(true);
+                int inflater_count = ((List<?>) inflaters.get(fs)).size();
+                if (inflater_count > MAX_FLATERS) {
+                    throw new Exception("Too many inflaters " + inflater_count);
+                }
+                Field deflaters = fs.getClass().getDeclaredField("deflaters");
+                deflaters.setAccessible(true);
+                int deflater_count = ((List<?>) deflaters.get(fs)).size();
+                if (deflater_count > MAX_FLATERS) {
+                    throw new Exception("Too many deflaters " + deflater_count);
+                }
+            } catch (NoSuchFieldException nsfe) {
+                // Probably the implementation has changed, so there's not much we can do...
+                throw new RuntimeException("Implementation of jdk.nio.zipfs.ZipFileSystem changed - disable or fix the test");
+            }
+        } finally {
+            Files.deleteIfExists(zipFile);
+        }
+
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2007, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6356322
+ * @summary Tests that embedded frame's graphics configuration is updated
+ *          correctly when it is moved to another screen in multiscreen system,
+ *          XToolkit
+ * @author artem.ananiev@sun.com: area=awt.multiscreen
+ * @requires (os.family == "linux") | (os.family == "solaris")
+ * @run main GraphicsConfigTest
+ */
+
+import java.awt.*;
+import java.awt.peer.*;
+import java.lang.reflect.*;
+import java.util.*;
+import sun.awt.*;
+import sun.awt.X11.*;
+
+public class GraphicsConfigTest {
+
+    private static void init()
+        throws InterruptedException, AWTException {
+        if (!isXToolkit()) {
+            System.err.println("The test should be run only on XToolkit");
+            return;
+        }
+
+        GraphicsEnvironment ge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] gds = ge.getScreenDevices();
+        if (gds.length < 2) {
+            System.err.println("The test should be run only in"
+                + " multiscreen configuration");
+            return;
+        }
+
+        boolean xinerama = Arrays.stream(gds)
+            .map((gd) -> gd.getDefaultConfiguration().getBounds())
+            .filter((r) -> r.x != 0 || r.y != 0).findFirst().isPresent();
+
+        if (!xinerama) {
+            System.err.println("The test should be run only with Xinerama ON");
+            return;
+        }
+
+        Rectangle r0 = gds[0].getDefaultConfiguration().getBounds();
+        Rectangle r1 = gds[1].getDefaultConfiguration().getBounds();
+
+        System.setProperty("sun.awt.xembedserver", "true");
+        Frame f = new Frame("F");
+        try {
+            final Robot robot = new Robot();
+
+            f.setBounds(r0.x + 100, r0.y + 100, 200, 200);
+            f.setVisible(true);
+            robot.waitForIdle();
+            Thread.sleep(1000);
+
+            Canvas c = new Canvas();
+            f.add(c);
+            AWTAccessor.ComponentAccessor acc =
+                        AWTAccessor.getComponentAccessor();
+            WindowIDProvider wip = (XEmbedCanvasPeer)acc.getPeer(c);
+            long h = wip.getWindow();
+
+            EmbeddedFrame e = createEmbeddedFrame(h);
+            ((FramePeer)acc.getPeer(e)).setBoundsPrivate(0, 0, 100,
+                100); // triggers XConfigureEvent
+            e.registerListeners();
+            e.setVisible(true);
+            robot.waitForIdle();
+            Thread.sleep(1000);
+
+            if (!checkGC(f, e)) {
+                throw new RuntimeException("Failed at checkpoint 1");
+            }
+
+            f.setLocation(r1.x + 100, r1.y + 100);
+            Thread.sleep(100);
+            ((FramePeer)acc.getPeer(e)).setBoundsPrivate(0, 0, 101,
+                101); // triggers XConfigureEvent
+            robot.waitForIdle();
+            Thread.sleep(1000);
+
+            if (!checkGC(f, e)) {
+                throw new RuntimeException("Failed at checkpoint 2");
+            }
+
+            f.setLocation(r0.x + 100, r0.y + 100);
+            Thread.sleep(100);
+            ((FramePeer)acc.getPeer(e)).setBoundsPrivate(0, 0, 102,
+                102); // triggers XConfigureEvent
+            robot.waitForIdle();
+            Thread.sleep(1000);
+
+            if (!checkGC(f, e)) {
+                throw new RuntimeException("Failed at checkpoint 3");
+            }
+
+        } finally {
+            f.dispose();
+        }
+    }
+
+    private static boolean isXToolkit() {
+        return Toolkit.getDefaultToolkit().getClass()
+                        .getName().equals("sun.awt.X11.XToolkit");
+    }
+
+    private static EmbeddedFrame createEmbeddedFrame(long window) {
+        try {
+            Class cl = Class.forName("sun.awt.X11.XEmbeddedFrame");
+            Constructor cons = cl.getConstructor(
+                new Class[]{Long.TYPE, Boolean.TYPE});
+            return (EmbeddedFrame) cons.newInstance(new Object[]{window, true});
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Can't create embedded frame");
+        }
+    }
+
+    private static boolean checkGC(Component c, Component d) {
+        GraphicsConfiguration g1 = c.getGraphicsConfiguration();
+        System.err.println(g1);
+        GraphicsConfiguration g2 = d.getGraphicsConfiguration();
+        System.err.println(g2);
+
+        return g1.equals(g2);
+    }
+
+    public static void main(String args[]) throws InterruptedException, AWTException {
+        init();
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java	2021-09-01 14:33:15.000000000 +0000
@@ -89,9 +89,9 @@
         Point fp = f.getLocationOnScreen();
         r.mouseMove(fp.x + f.getWidth() / 2, fp.y + f.getHeight() / 2);
         Util.waitForIdle(r);
-        r.mousePress(InputEvent.BUTTON1_MASK);
+        r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         Util.waitForIdle(r);
-        r.mouseRelease(InputEvent.BUTTON2_MASK);
+        r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         f.removeMouseListener(exceptionListener);
 
         if (!exceptionHandled)
@@ -117,9 +117,9 @@
         Point dp = d.getLocationOnScreen();
         r.mouseMove(dp.x + d.getWidth() / 2, dp.y + d.getHeight() / 2);
         Util.waitForIdle(r);
-        r.mousePress(InputEvent.BUTTON1_MASK);
+        r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         Util.waitForIdle(r);
-        r.mouseRelease(InputEvent.BUTTON2_MASK);
+        r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         d.removeMouseListener(exceptionListener);
 
         if (!exceptionHandled)
@@ -141,9 +141,9 @@
         mousePressed = false;
         r.mouseMove(fp.x + 50, fp.y + 50);
         Util.waitForIdle(r);
-        r.mousePress(InputEvent.BUTTON1_MASK);
+        r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         Util.waitForIdle(r);
-        r.mouseRelease(InputEvent.BUTTON1_MASK);
+        r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         Util.waitForIdle(r);
         f.removeMouseListener(pressedListener);
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EventQueue/6980209/bug6980209.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EventQueue/6980209/bug6980209.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/EventQueue/6980209/bug6980209.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/EventQueue/6980209/bug6980209.java	2021-09-01 14:33:15.000000000 +0000
@@ -27,18 +27,17 @@
    @author Semyon Sadetsky
   */
 
-import sun.util.logging.PlatformLogger;
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.util.logging.Logger;
 
 public class bug6980209 implements ActionListener {
-    private final static PlatformLogger log =
-            PlatformLogger.getLogger("java.awt.event.WaitDispatchSupport");
+    private final static Logger log =
+            Logger.getLogger("java.awt.event.WaitDispatchSupport");
     public static final int ATTEMPTS = 100;
     public static final int EVENTS = 5;
 
@@ -52,8 +51,8 @@
     public static void main(String[] args) throws Exception {
         System.out.println(
                 "PLEASE DO NOT TOUCH KEYBOARD AND MOUSE DURING THE TEST RUN!");
-        // log.setLevel(PlatformLogger.Level.FINE);
-        // log.setLevel(PlatformLogger.Level.FINEST);
+        // log.setLevel(java.util.logging.Level.FINE);
+        // log.setLevel(java.util.logging.Level.FINEST);
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
                 public void run() {
@@ -238,4 +237,4 @@
         }
         log.fine("\n---TEST END---");
     }
-}
\ No newline at end of file
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/font/GlyphVector/TestLayoutFlags.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/font/GlyphVector/TestLayoutFlags.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/font/GlyphVector/TestLayoutFlags.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/font/GlyphVector/TestLayoutFlags.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2004, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/* @test
+   @bug 4328745 5090704
+   @summary exercise getLayoutFlags, getGlyphCharIndex, getGlyphCharIndices
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.font.*;
+import java.awt.geom.*;
+
+public class TestLayoutFlags {
+
+    static public void main(String[] args) {
+        new TestLayoutFlags().runTest();
+    }
+
+    void runTest() {
+
+        Font font = new Font("Lucida Sans", Font.PLAIN, 24);
+
+        String latin1 = "This is a latin1 string"; // none
+        String hebrew = "\u05d0\u05d1\u05d2\u05d3"; // rtl
+        String arabic = "\u0646\u0644\u0622\u0646"; // rtl + mc/g
+        String hindi = "\u0939\u093f\u0923\u094d\u0921\u0940"; // ltr + reorder
+        //      String tamil = "\u0b9c\u0bcb"; // ltr + mg/c + split
+
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+
+        // get glyph char indices needs to initializes layoutFlags before use (5090704)
+        {
+          GlyphVector gv = font.createGlyphVector(frc, "abcde");
+          int ix = gv.getGlyphCharIndex(0);
+          if (ix != 0) {
+            throw new Error("glyph 0 incorrectly mapped to char " + ix);
+          }
+          int[] ixs = gv.getGlyphCharIndices(0, gv.getNumGlyphs(), null);
+          for (int i = 0; i < ixs.length; ++i) {
+            if (ixs[i] != i) {
+              throw new Error("glyph " + i + " incorrectly mapped to char " + ixs[i]);
+            }
+          }
+        }
+
+        GlyphVector latinGV = makeGlyphVector("Lucida Sans", frc, latin1, false, 1 /* ScriptRun.LATIN */);
+        GlyphVector hebrewGV = makeGlyphVector("Lucida Sans", frc, hebrew, true, 5 /* ScriptRun.HEBREW */);
+        GlyphVector arabicGV = makeGlyphVector("Lucida Sans", frc, arabic, true, 6 /* ScriptRun.ARABIC */);
+        GlyphVector hindiGV = makeGlyphVector("Lucida Sans", frc, hindi, false, 7 /* ScriptRun.DEVANAGARI */);
+        //      GlyphVector tamilGV = makeGlyphVector("Devanagari MT for IBM", frc, tamil, false, 12 /* ScriptRun.TAMIL */);
+
+        GlyphVector latinPos = font.createGlyphVector(frc, latin1);
+        Point2D pt = latinPos.getGlyphPosition(0);
+        pt.setLocation(pt.getX(), pt.getY() + 1.0);
+        latinPos.setGlyphPosition(0, pt);
+
+        GlyphVector latinTrans = font.createGlyphVector(frc, latin1);
+        latinTrans.setGlyphTransform(0, AffineTransform.getRotateInstance(.15));
+
+        test("latin", latinGV, GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
+        test("hebrew", hebrewGV, GlyphVector.FLAG_RUN_RTL |
+             GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
+        test("arabic", arabicGV, GlyphVector.FLAG_RUN_RTL |
+             GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
+        test("hindi", hindiGV, GlyphVector.FLAG_COMPLEX_GLYPHS |
+             GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
+        //      test("tamil", tamilGV, GlyphVector.FLAG_COMPLEX_GLYPHS);
+        test("pos", latinPos, GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
+        test("trans", latinTrans, GlyphVector.FLAG_HAS_TRANSFORMS);
+    }
+
+    GlyphVector makeGlyphVector(String fontname, FontRenderContext frc, String text, boolean rtl, int script) {
+        Font font = new Font(fontname, Font.PLAIN, 14);
+        System.out.println("asking for " + fontname + " and got " + font.getFontName());
+        int flags = rtl ? 1 : 0;
+        return font.layoutGlyphVector(frc, text.toCharArray(), 0, text.length(), flags);
+    }
+
+    void test(String name, GlyphVector gv, int expectedFlags) {
+        expectedFlags &= gv.FLAG_MASK;
+        int computedFlags = computeFlags(gv) & gv.FLAG_MASK;
+        int actualFlags = gv.getLayoutFlags() & gv.FLAG_MASK;
+
+        System.out.println("\n*** " + name + " ***");
+        System.out.println(" test flags");
+        System.out.print("expected ");
+        printFlags(expectedFlags);
+        System.out.print("computed ");
+        printFlags(computedFlags);
+        System.out.print("  actual ");
+        printFlags(actualFlags);
+
+        if (expectedFlags != actualFlags) {
+            throw new Error("layout flags in test: " + name +
+                            " expected: " + Integer.toHexString(expectedFlags) +
+                            " but got: " + Integer.toHexString(actualFlags));
+        }
+    }
+
+    static public void printFlags(int flags) {
+        System.out.print("flags:");
+        if ((flags & GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS) != 0) {
+            System.out.print(" pos");
+        }
+        if ((flags & GlyphVector.FLAG_HAS_TRANSFORMS) != 0) {
+            System.out.print(" trans");
+        }
+        if ((flags & GlyphVector.FLAG_RUN_RTL) != 0) {
+            System.out.print(" rtl");
+        }
+        if ((flags & GlyphVector.FLAG_COMPLEX_GLYPHS) != 0) {
+            System.out.print(" complex");
+        }
+        if ((flags & GlyphVector.FLAG_MASK) == 0) {
+            System.out.print(" none");
+        }
+        System.out.println();
+    }
+
+    int computeFlags(GlyphVector gv) {
+        validateCharIndexMethods(gv);
+
+        int result = 0;
+        if (glyphsAreRTL(gv)) {
+            result |= GlyphVector.FLAG_RUN_RTL;
+        }
+        if (hasComplexGlyphs(gv)) {
+            result |= GlyphVector.FLAG_COMPLEX_GLYPHS;
+        }
+
+        return result;
+    }
+
+    /**
+     * throw an exception if getGlyphCharIndices returns a different result than
+     * you get from iterating through getGlyphCharIndex one at a time.
+     */
+    void validateCharIndexMethods(GlyphVector gv) {
+        int[] indices = gv.getGlyphCharIndices(0, gv.getNumGlyphs(), null);
+        for (int i = 0; i < gv.getNumGlyphs(); ++i) {
+            if (gv.getGlyphCharIndex(i) != indices[i]) {
+                throw new Error("glyph index mismatch at " + i);
+            }
+        }
+    }
+
+    /**
+     * Return true if the glyph indices are pure ltr
+     */
+    boolean glyphsAreLTR(GlyphVector gv) {
+        int[] indices = gv.getGlyphCharIndices(0, gv.getNumGlyphs(), null);
+        for (int i = 0; i < indices.length; ++i) {
+            if (indices[i] != i) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return true if the glyph indices are pure rtl
+     */
+    boolean glyphsAreRTL(GlyphVector gv) {
+        int[] indices = gv.getGlyphCharIndices(0, gv.getNumGlyphs(), null);
+        for (int i = 0; i < indices.length; ++i) {
+            if (indices[i] != indices.length - i - 1) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return true if there is a local reordering (the run is not ltr or rtl).
+     * !!! We can't have mixed bidi runs in the glyphs.
+     */
+    boolean hasComplexGlyphs(GlyphVector gv) {
+        return !glyphsAreLTR(gv) && !glyphsAreRTL(gv);
+    }
+}
+
+/*
+rect getPixelBounds(frc, x, y)
+rect getGlyphPixelBounds(frc, int, x, y)
+getGlyphOutline(int index, x, y)
+getGlyphInfo()
+*/
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/font/Underline/UnderlineTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/font/Underline/UnderlineTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/font/Underline/UnderlineTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/font/Underline/UnderlineTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2006, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * @test
+ * @bug 6216010
+ * @summary check to see that underline thickness scales.
+ * @run main UnderlineTest
+ */
+
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineMetrics;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
+import java.util.HashMap;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+
+public class UnderlineTest {
+    static class FontsPanel extends Container {
+        FontsPanel(Font[] fonts) {
+            setLayout(new GridLayout(0, 1));
+            for (int i = 0; i < fonts.length; ++i) {
+              add(new FontPanel(fonts[i]));
+            }
+        }
+    }
+
+    static String fps = "Stellar glyphs";
+    static Dimension fpd = new Dimension(600, 120);
+    static class FontPanel extends JComponent {
+        Font f;
+        FontPanel(Font f) {
+            this.f = f;
+            setPreferredSize(fpd);
+            setMinimumSize(fpd);
+            setMaximumSize(fpd);
+            setSize(fpd);
+        }
+
+        public void paintComponent(Graphics g) {
+            g.setColor(Color.WHITE);
+            g.fillRect(0, 0, fpd.width, fpd.height);
+
+            g.setColor(Color.RED);
+            FontRenderContext frc = ((Graphics2D)g).getFontRenderContext();
+            LineMetrics lm = f.getLineMetrics(fps, frc);
+            int h = (int)(fpd.height - 20 - lm.getAscent());
+            g.drawLine(20, h, fpd.width - 20, h);
+            h = fpd.height - 20;
+            g.drawLine(20, h, fpd.width - 20, h);
+            h = (int)(fpd.height - 20 + lm.getDescent());
+            g.drawLine(20, h, fpd.width - 20, h);
+
+            g.setColor(Color.BLACK);
+            g.setFont(f);
+            g.drawString(fps, 50, fpd.height - 20);
+        }
+    }
+
+    public static void main(String args[]) {
+        String fontName = "Lucida Sans";
+        if (args.length > 0) {
+            fontName = args[0];
+        }
+        FontRenderContext frc = new FontRenderContext(null, false, false);
+        FontRenderContext frc2 = new FontRenderContext(AffineTransform.getScaleInstance(1.5, 1.5), false, false);
+
+        Font font0 = new Font(fontName, 0, 20);
+        HashMap map = new HashMap();
+        map.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+        map.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);
+        Font font = font0.deriveFont(map);
+
+        System.out.println("Using font: " + font);
+
+        double rot = -Math.PI/4;
+        AffineTransform scrtx = AffineTransform.getRotateInstance(rot);
+        scrtx.scale(1, 2);
+
+        Font[] fonts = {
+            font.deriveFont(1f),
+            font.deriveFont(20f),
+            font.deriveFont(40f),
+            font.deriveFont(80f),
+            font.deriveFont(AffineTransform.getRotateInstance(rot)),
+            font.deriveFont(AffineTransform.getScaleInstance(1, 2)),
+            font.deriveFont(AffineTransform.getScaleInstance(2, 4)),
+            font.deriveFont(scrtx),
+        };
+
+        LineMetrics[] metrics = new LineMetrics[fonts.length * 2];
+        for (int i = 0; i < metrics.length; ++i) {
+            Font f = fonts[i % fonts.length];
+            FontRenderContext frcx = i < fonts.length ? frc : frc2;
+            metrics[i] = f.getLineMetrics("X", frcx);
+      //       dumpMetrics("Metrics for " + f.getSize2D() + " pt. font,\n  tx: " +
+      //       f.getTransform() + ",\n   frctx: " + frcx.getTransform(), metrics[i]);
+        }
+
+        // test for linear scale
+        // this seems to work, might need to get fancy to deal with last-significant-bit issues?
+        double ds1 = metrics[2].getStrikethroughOffset() - metrics[1].getStrikethroughOffset();
+        double du1 = metrics[2].getUnderlineThickness() - metrics[1].getUnderlineThickness();
+        double ds2 = metrics[3].getStrikethroughOffset() - metrics[2].getStrikethroughOffset();
+        double du2 = metrics[3].getUnderlineThickness() - metrics[2].getUnderlineThickness();
+        if (ds2 != ds1 * 2 || du2 != du1 * 2) {
+            throw new IllegalStateException("non-linear scale: " + ds1 + " / " + ds2 + ", " +
+                                            du1 + " / " + du2);
+        }
+
+        JFrame jf = new JFrame("Fonts");
+        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        jf.add(new JScrollPane(new FontsPanel(fonts)));
+        jf.pack();
+        jf.setVisible(true);
+    }
+
+    static void dumpMetrics(String header, LineMetrics lm) {
+        if (header != null) {
+            System.out.println(header);
+        }
+        System.out.println("asc: " + lm.getAscent());
+        System.out.println("dsc: " + lm.getDescent());
+        System.out.println("ulo: " + lm.getUnderlineOffset());
+        System.out.println("ult: " + lm.getUnderlineThickness());
+        System.out.println("sto: " + lm.getStrikethroughOffset());
+        System.out.println("stt: " + lm.getStrikethroughThickness());
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020, 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
@@ -21,8 +21,11 @@
  * questions.
  */
 
-import java.io.*;
-import java.awt.*;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.awt.Font;
 
 public class DeleteFont {
 
@@ -55,19 +58,22 @@
         if (!gotException) {
             throw new RuntimeException("No expected IOException");
         }
-        badRead(-2, Font.TRUETYPE_FONT);
-        badRead(8193, Font.TRUETYPE_FONT);
 
-        badRead(-2, Font.TYPE1_FONT);
-        badRead(8193, Font.TYPE1_FONT);
+        badRead(-2, 16, Font.TYPE1_FONT);
+        badRead(8193, 14, Font.TYPE1_FONT);
+
+        badRead(-2, 12, Font.TRUETYPE_FONT);
+        badRead(8193, 10, Font.TRUETYPE_FONT);
 
         // Make sure GC has a chance to clean up before we exit.
         System.gc(); System.gc();
+        Thread.sleep(5000);
+        System.gc(); System.gc();
     }
 
-    static void badRead(final int retval, int fontType) {
+    static void badRead(final int retval, final int multiple, int fontType) {
         int num = 2;
-        byte[] buff = new byte[16*8192]; // Multiple of 8192 is important.
+        byte[] buff = new byte[multiple*8192]; // Multiple of 8192 is important.
         for (int ct=0; ct<num; ++ct) {
             try {
                 Font.createFont(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.sh openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.sh
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2021-09-01 14:33:15.000000000 +0000
@@ -20,7 +20,8 @@
 # questions.
 
 # @test
-# @bug 6189812 6380357 6632886
+# @bug 6189812 6380357 6632886 8249142
+# @key intermittent
 # @summary Verify that temporary font files are deleted on exit.
 
 if [ -z "${TESTSRC}" ]; then
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,44 @@
+<html>
+<!--
+ Copyright (c) 2003, 2015, 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
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!--  
+  @test
+  @bug 4828019
+  @summary Frame/Window deadlock
+  @author yan@sparc.spb.su: area=
+  @run applet/timeout=9999 NonEDT_GUI_Deadlock.html
+  -->
+<head>
+<title>  </title>
+</head>
+<body>
+
+<h1>NonEDT_GUI_Deadlock<br>Bug ID: 4828019</h1>
+
+<p> This is an AUTOMATIC test, simply wait for completion </p>
+
+<APPLET CODE="NonEDT_GUI_Deadlock.class" WIDTH=200 HEIGHT=200></APPLET>
+</body>
+</html>
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+  test
+  @bug 4828019
+  @summary Frame/Window deadlock
+  @author yan@sparc.spb.su: area=
+  @run applet NonEDT_GUI_Deadlock.html
+*/
+
+// Note there is no @ in front of test above.  This is so that the
+//  harness will not mistake this file as a test file.  It should
+//  only see the html file as a test file. (the harness runs all
+//  valid test files, so it would run this test twice if this file
+//  were valid as well as the html file.)
+// Also, note the area= after Your Name in the author tag.  Here, you
+//  should put which functional area the test falls in.  See the
+//  AWT-core home page -> test areas and/or -> AWT team  for a list of
+//  areas.
+// Note also the 'AutomaticAppletTest.html' in the run tag.  This should
+//  be changed to the name of the test.
+
+
+/**
+ * NonEDT_GUI_Deadlock.java
+ *
+ * summary:
+ */
+
+import java.applet.Applet;
+import java.awt.*;
+import java.awt.event.*;
+import java.net.*;
+import java.io.*;
+
+
+//Automated tests should run as applet tests if possible because they
+// get their environments cleaned up, including AWT threads, any
+// test created threads, and any system resources used by the test
+// such as file descriptors.  (This is normally not a problem as
+// main tests usually run in a separate VM, however on some platforms
+// such as the Mac, separate VMs are not possible and non-applet
+// tests will cause problems).  Also, you don't have to worry about
+// synchronisation stuff in Applet tests they way you do in main
+// tests...
+
+
+public class NonEDT_GUI_Deadlock extends Applet
+{
+    //Declare things used in the test, like buttons and labels here
+    boolean bOK = false;
+    Thread badThread = null;
+
+    public void init()
+    {
+        //Create instructions for the user here, as well as set up
+        // the environment -- set the layout manager, add buttons,
+        // etc.
+
+
+        String[] instructions =
+        {
+            "This is an AUTOMATIC test",
+            "simply wait until it is done"
+        };
+        Sysout.createDialog( );
+        Sysout.printInstructions( instructions );
+
+    }//End  init()
+
+    public void start ()
+    {
+        //Get things going.  Request focus, set size, et cetera
+
+        setSize (200,300);
+        setVisible(true);
+        validate();
+
+        final Frame theFrame = new Frame("Window test");
+        theFrame.setSize(240, 200);
+
+        Thread thKiller = new Thread() {
+           public void run() {
+              try {
+                 Thread.sleep( 9000 );
+              }catch( Exception ex ) {
+              }
+              if( !bOK ) {
+                 // oops,
+                 //Sysout.println("Deadlock!");
+                 Runtime.getRuntime().halt(0);
+              }else{
+                 //Sysout.println("Passed ok.");
+              }
+           }
+        };
+        thKiller.setName("Killer thread");
+        thKiller.start();
+        Window w = new TestWindow(theFrame);
+        theFrame.toBack();
+        theFrame.setVisible(true);
+
+        theFrame.setLayout(new FlowLayout(FlowLayout.CENTER));
+        EventQueue.invokeLater(new Runnable() {
+           public void run() {
+               bOK = true;
+           }
+        });
+
+
+
+    }// start()
+    class TestWindow extends Window implements Runnable {
+
+        TestWindow(Frame f) {
+            super(f);
+
+            //setSize(240, 75);
+            setLocation(0, 75);
+
+            show();
+            toFront();
+
+            badThread = new Thread(this);
+            badThread.setName("Bad Thread");
+            badThread.start();
+
+        }
+
+        public void paint(Graphics g) {
+            g.drawString("Deadlock or no deadlock?",20,80);
+        }
+
+        public void run() {
+
+            long ts = System.currentTimeMillis();
+
+            while (true) {
+                if ((System.currentTimeMillis()-ts)>3000) {
+                    this.setVisible( false );
+                    dispose();
+                    break;
+                }
+
+                toFront();
+                try {
+                    Thread.sleep(80);
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+
+
+
+    public static void main(String args[]) {
+       NonEDT_GUI_Deadlock imt = new NonEDT_GUI_Deadlock();
+       imt.init();
+       imt.start();
+    }
+
+
+}// class NonEDT_GUI_Deadlock
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+  chunk of code whose purpose is to make user
+  interaction uniform, and thereby make it simpler
+  to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+  for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+  WithInstructions method.  Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+  with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+  as standalone.
+ */
+
+class Sysout
+{
+    private static TestDialog dialog;
+
+    public static void createDialogWithInstructions( String[] instructions )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        dialog.printInstructions( instructions );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+    public static void createDialog( )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        String[] defInstr = { "Instructions will appear here. ", "" } ;
+        dialog.printInstructions( defInstr );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+
+    public static void printInstructions( String[] instructions )
+    {
+        dialog.printInstructions( instructions );
+    }
+
+
+    public static void println( String messageIn )
+    {
+        dialog.displayMessage( messageIn );
+    }
+
+}// Sysout  class
+
+/**
+  This is part of the standard test machinery.  It provides a place for the
+   test instructions to be displayed, and a place for interactive messages
+   to the user to be displayed.
+  To have the test instructions displayed, see Sysout.
+  To have a message to the user be displayed, see Sysout.
+  Do not call anything in this dialog directly.
+  */
+class TestDialog extends Dialog
+{
+
+    TextArea instructionsText;
+    TextArea messageText;
+    int maxStringLength = 80;
+
+    //DO NOT call this directly, go through Sysout
+    public TestDialog( Frame frame, String name )
+    {
+        super( frame, name );
+        int scrollBoth = TextArea.SCROLLBARS_BOTH;
+        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+        add( "North", instructionsText );
+
+        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+        add("Center", messageText);
+
+        pack();
+
+        show();
+    }// TestDialog()
+
+    //DO NOT call this directly, go through Sysout
+    public void printInstructions( String[] instructions )
+    {
+        //Clear out any current instructions
+        instructionsText.setText( "" );
+
+        //Go down array of instruction strings
+
+        String printStr, remainingStr;
+        for( int i=0; i < instructions.length; i++ )
+        {
+            //chop up each into pieces maxSringLength long
+            remainingStr = instructions[ i ];
+            while( remainingStr.length() > 0 )
+            {
+                //if longer than max then chop off first max chars to print
+                if( remainingStr.length() >= maxStringLength )
+                {
+                    //Try to chop on a word boundary
+                    int posOfSpace = remainingStr.
+                        lastIndexOf( ' ', maxStringLength - 1 );
+
+                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
+                    remainingStr = remainingStr.substring( posOfSpace + 1 );
+                }
+                //else just print
+                else
+                {
+                    printStr = remainingStr;
+                    remainingStr = "";
+                }
+
+                instructionsText.append( printStr + "\n" );
+
+            }// while
+
+        }// for
+
+    }//printInstructions()
+
+    //DO NOT call this directly, go through Sysout
+    public void displayMessage( String messageIn )
+    {
+        messageText.append( messageIn + "\n" );
+        System.out.println(messageIn);
+    }
+
+}// TestDialog  class
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -45,6 +45,7 @@
                 GraphicsEnvironment.getLocalGraphicsEnvironment()
                                    .getScreenDevices();
         if (devices.length < 2 || devices[0].getDisplayModes().length < 2
+                || !devices[0].isDisplayChangeSupported()
                 || !devices[0].isFullScreenSupported()
                 || !devices[1].isFullScreenSupported()) {
             System.err.println("Testcase is not applicable");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.VolatileImage;
+
+import static java.awt.Transparency.BITMASK;
+
+/**
+ * @test
+ * @bug 7188942
+ * @summary We should get correct volatile image, when we use BITMASK
+ *          transparency
+ */
+public final class BitmaskVolatileImage {
+
+    public static final int S = 8;
+
+    public static void main(final String[] args) {
+        GraphicsConfiguration gc =
+                GraphicsEnvironment.getLocalGraphicsEnvironment()
+                        .getDefaultScreenDevice().getDefaultConfiguration();
+        VolatileImage vi = gc.createCompatibleVolatileImage(S, S, BITMASK);
+        BufferedImage ci = gc.createCompatibleImage(S, S, BITMASK);
+
+        int attempt = 0;
+        do {
+            if (++attempt > 10) {
+                throw new RuntimeException("Too many attempts: " + attempt);
+            }
+            vi.validate(gc);
+            test(vi, ci, gc);
+        } while (vi.contentsLost());
+    }
+
+    private static void test(VolatileImage vi, BufferedImage ci, GraphicsConfiguration gc) {
+        for (int r = 0; r <= 255; ++r) {
+            for (int a = 0; a <= 255; ++a) {
+                fill(vi, new Color(r, 0, 0, a));
+                fill(ci, new Color(r, 0, 0, a));
+                validate(ci, vi.getSnapshot());
+            }
+        }
+    }
+
+    private static void fill(Image image, Color color) {
+        Graphics2D g2d = (Graphics2D) image.getGraphics();
+        g2d.setColor(color);
+        g2d.setComposite(AlphaComposite.Src);
+        g2d.fillRect(0, 0, S, S);
+        g2d.dispose();
+    }
+
+    private static void validate(BufferedImage ci, BufferedImage snapshot) {
+        for (int y = 0; y < ci.getHeight(); y++) {
+            for (int x = 0; x < ci.getWidth(); x++) {
+                int ci_rgb = ci.getRGB(x, y);
+                int vi_rgb = snapshot.getRGB(x, y);
+                if (ci_rgb != vi_rgb) {
+                    System.err.println("Exp:" + Integer.toHexString(ci_rgb));
+                    System.err.println("Actual:" + Integer.toHexString(vi_rgb));
+                    throw new RuntimeException("Colors mismatch!");
+                }
+            }
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,44 @@
+<!--
+ Copyright (c) 2007, 2015, 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
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<html>
+<!--  
+  @test
+  @bug 6387275
+  @summary List: the focus is at the top of the first item, XAWT
+  @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @requires (os.family == "linux" | os.family == "solaris")
+  @run applet FocusEmptyListTest.html
+  -->
+<head>
+<title> FocusEmptyListTest </title>
+</head>
+<body>
+
+<h1>FocusEmptyListTest<br>Bug ID: 6387275 </h1>
+
+<p> This is an AUTOMATIC test, simply wait for completion </p>
+
+<APPLET CODE="FocusEmptyListTest.class" WIDTH=200 HEIGHT=200></APPLET>
+</body>
+</html>
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2007, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  test
+  @bug 6387275
+  @summary List: the focus is at the top of the first item, XAWT
+  @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @run applet FocusEmptyListTest.html
+*/
+
+import java.applet.Applet;
+import java.awt.*;
+import java.lang.reflect.*;
+import java.awt.peer.ListPeer;
+
+import sun.awt.AWTAccessor;
+
+public class FocusEmptyListTest extends Applet {
+
+    public void init() {
+        setLayout(new BorderLayout());
+    }//End  init()
+
+    public void start() {
+        boolean isXToolkit = Toolkit.getDefaultToolkit()
+            .getClass().getName().equals("sun.awt.X11.XToolkit");
+        if (!isXToolkit) {
+            System.out.println("The test is XAWT-only.");
+            return;
+        }
+
+        List list = new List();
+        Object isIndexDisplayed = null;
+        setLayout(new FlowLayout());
+
+        getToolkit().addAWTEventListener(System.out::println,
+            AWTEvent.FOCUS_EVENT_MASK | AWTEvent.WINDOW_FOCUS_EVENT_MASK);
+
+        add(list);
+        list.add("item1");
+
+        setSize(200, 200);
+        setVisible(true);
+        validate();
+
+        list.removeAll();
+
+        try {
+
+            // peer = List.getPeer()
+            ListPeer peer = (ListPeer)AWTAccessor.getComponentAccessor().getPeer(list);
+            System.out.println("peer = " + peer);
+            Class peerClass = peer.getClass();
+            System.out.println("peer's class = " + peerClass);
+
+            // isIndexDisplayed = peer.isIndexDisplayed(-1)
+            Method isIndexDisplayedM
+                = peerClass.getDeclaredMethod("isIndexDisplayed", Integer.TYPE);
+            System.out.println("method = " + isIndexDisplayedM);
+            isIndexDisplayedM.setAccessible(true);
+            isIndexDisplayed = isIndexDisplayedM.invoke(peer, -1);
+            System.out.println("isIndexDisplayed=" + isIndexDisplayed);
+
+        } catch (Throwable thr) {
+            throw new RuntimeException("TEST FAILED: " + thr);
+        }
+
+        if ((Boolean) isIndexDisplayed) {
+            throw new RuntimeException("TEST FAILED: -1 should be"
+                + " invisible index");
+        }
+
+    }// start()
+
+}// class AutomaticAppletTest
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2021-09-01 14:33:15.000000000 +0000
@@ -40,7 +40,8 @@
 
 /**
  * AWT/Swing overlapping test for {@link javax.swing.JSplitPane } component.
- * <p>This test creates puts heavyweight and lightweight components into different panels and test if splitter image and components itself are drawn correctly.
+ * <p>This test puts heavyweight and lightweight components into different
+ * panels and test if splitter image and components itself are drawn correctly.
  * <p>See base class for test info.
  */
 /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -30,7 +30,7 @@
 
 /**
  * @test
- * @bug 8012026
+ * @bug 8012026 8027154
  * @summary Component.getMousePosition() does not work in an applet on MacOS
  * @author Petr Pchelko
  * @library ../../regtesthelpers
@@ -79,33 +79,31 @@
         frame1.setBounds(100, 100, 100, 100);
         frame1.addMouseMotionListener(new MouseMotionAdapter() {
 
-            private boolean shown = false;
-
             @Override
             public void mouseMoved(MouseEvent e) {
-                if (shown) {
-                    return;
-                }
-
-                shown = true;
-
                 frame2 = new Frame();
                 frame2.setBounds(120, 120, 120, 120);
-                frame2.setVisible(true);
 
-                Point positionInFrame2 = frame2.getMousePosition();
-                if (positionInFrame2.x != 30 || positionInFrame2.y != 30) {
-                    throw new RuntimeException("Wrong position reported. Should be [30, 30] but was [" +
-                            positionInFrame2.x + ", " + positionInFrame2.y + "]");
-                }
-
-                Point positionInFrame1 = frame1.getMousePosition();
-                if (positionInFrame1 != null) {
-                    throw new RuntimeException("Wrong position reported. Should be null");
-                }
+                frame2.addMouseMotionListener(new MouseMotionAdapter() {
+                    @Override
+                    public void mouseMoved(MouseEvent e)
+                    {
+                        Point positionInFrame2 = frame2.getMousePosition();
+                        if (positionInFrame2.x != 30 || positionInFrame2.y != 30) {
+                            throw new RuntimeException("Wrong position reported. Should be [30, 30] but was [" +
+                                    positionInFrame2.x + ", " + positionInFrame2.y + "]");
+                        }
+
+                        Point positionInFrame1 = frame1.getMousePosition();
+                        if (positionInFrame1 != null) {
+                            throw new RuntimeException("Wrong position reported. Should be null");
+                        }
+                    }
+                });
 
+                frame2.setVisible(true);
             }
         });
         frame1.setVisible(true);
     }
-}
+}
\ No newline at end of file
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Paint/RepaintOnAWTShutdown.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Paint/RepaintOnAWTShutdown.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Paint/RepaintOnAWTShutdown.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Paint/RepaintOnAWTShutdown.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 6847157
+ * @key headful
+ * @summary the java2D/AWT should die silently without exceptions
+ * @run main/othervm                           RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=1    RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=1.2  RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=1.25 RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=1.5  RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=1.75 RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=2    RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=2.25 RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=5    RepaintOnAWTShutdown
+ * @run main/othervm -Dsun.java2d.uiScale=10   RepaintOnAWTShutdown
+ */
+public final class RepaintOnAWTShutdown implements Runnable {
+
+    private static final CountDownLatch go = new CountDownLatch(1);
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeLater(new RepaintOnAWTShutdown());
+        go.await(5, TimeUnit.SECONDS);
+        // The test will check that no exception is thrown when the jtreg will
+        // kill this test at the moment the frame will be painted
+    }
+
+    public void run() {
+        JFrame frame = new JFrame();
+        JPanel panel = new MyPanel();
+        panel.setPreferredSize(new Dimension(100, 100));
+        panel.setLayout(new FlowLayout());
+        panel.add(new JTree());
+        panel.add(new JList(new String[]{"one", "two"}));
+        panel.add(new JTable(new String[][]{{"one", "two"}},
+                             new String[]{"one", "two"}));
+        frame.add(panel);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        // the frame is not disposed intentionally
+    }
+
+
+    private final class MyPanel extends JPanel {
+
+        public void paint(Graphics g) {
+            super.paint(g);
+            go.countDown();
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/print/PrintServicesSecurityManager.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/print/PrintServicesSecurityManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/print/PrintServicesSecurityManager.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/print/PrintServicesSecurityManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Arrays;
+
+import javax.print.PrintServiceLookup;
+
+/*
+ * @test
+ * @bug 8241829
+ */
+public final class PrintServicesSecurityManager {
+
+    public static void main(String[] args) throws InterruptedException {
+        System.setSecurityManager(new SecurityManager());
+        test();
+        Thread.sleep(3000); // to be sure the pooling thread started
+        test();
+    }
+
+    private static void test() {
+        Object[] services = PrintServiceLookup.lookupPrintServices(null, null);
+        if (services.length != 0) {
+            System.err.println("services = " + Arrays.toString(services));
+            throw new RuntimeException("The array of Services must be empty");
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import java.util.concurrent.CountDownLatch;
+
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8166673
+ */
+public final class WaitForIdleSyncroizedOnString {
+
+    private static final String WAIT_LOCK = "Wait Lock";
+
+    private static volatile boolean passed = true;
+
+    public static void main(final String[] args) throws Exception {
+        CountDownLatch go = new CountDownLatch(1);
+        Robot r = new Robot();
+        SwingUtilities.invokeLater(() -> System.out.println("some work"));
+        Thread t = new Thread(() -> {
+            synchronized (WAIT_LOCK) {
+                go.countDown();
+                try {
+                    Thread.sleep(30000);
+                    passed = false;
+                } catch (InterruptedException e) {
+                    System.out.println("e = " + e);
+                }
+            }
+        });
+        t.start();
+        go.await();
+        r.waitForIdle();
+        t.interrupt();
+        if (!passed) {
+            throw new RuntimeException("Test failed");
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, 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
@@ -26,20 +26,18 @@
   @bug 6758673
   @summary Tests that windows are removed from owner's child windows list
   @author art: area=awt.toplevel
-  @run main OwnedWindowsLeak
+  @run main/othervm -mx128m OwnedWindowsLeak
 */
 
-import java.awt.*;
-import java.awt.event.*;
-
-import java.lang.ref.*;
-import java.lang.reflect.*;
-
-import java.util.*;
+import java.awt.Frame;
+import java.awt.Window;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.util.Vector;
 
 public class OwnedWindowsLeak
 {
-    public static void main(String[] args)
+    public static void main(String[] args) throws Exception
     {
         Frame owner = new Frame("F");
 
@@ -49,6 +47,7 @@
         for (int i = 0; i < 1000; i++)
         {
             Window child = new Window(owner);
+            child.setName("window_" +  i);
             children.add(new WeakReference<Window>(child));
         }
 
@@ -70,31 +69,22 @@
         // Third, make sure all the weak references are null
         for (WeakReference<Window> ref : children)
         {
-            if (ref.get() != null)
-            {
-                throw new RuntimeException("Test FAILED: some of child windows are not GCed");
+            while (ref.get() != null) {
+                System.out.println("ref.get() = " + ref.get());
+                System.gc();
+                Thread.sleep(1000);
             }
         }
 
         // Fourth, make sure owner's children list contains no elements
-        try
-        {
-            Field f = Window.class.getDeclaredField("ownedWindowList");
-            f.setAccessible(true);
-            Vector ownersChildren = (Vector)f.get(owner);
-            if (ownersChildren.size() > 0)
-            {
-                throw new RuntimeException("Test FAILED: some of the child windows are not removed from owner's children list");
-            }
-        }
-        catch (NoSuchFieldException z)
-        {
-            System.out.println("Test PASSED: no 'ownedWindowList' field in Window class");
-            return;
-        }
-        catch (Exception z)
-        {
-            throw new RuntimeException("Test FAILED: unexpected exception", z);
+        Field f = Window.class.getDeclaredField("ownedWindowList");
+        f.setAccessible(true);
+        Vector ownersChildren = (Vector)f.get(owner);
+        while (ownersChildren.size() > 0)
+        {
+            System.out.println("ownersChildren = " + ownersChildren);
+            System.gc();
+            Thread.sleep(1000);
         }
 
         // Test passed
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/xembed/server/TestXEmbedServer.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/xembed/server/TestXEmbedServer.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/awt/xembed/server/TestXEmbedServer.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/awt/xembed/server/TestXEmbedServer.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,8 @@
 import java.io.*;
 import java.util.logging.*;
 import sun.awt.WindowIDProvider;
+import sun.awt.AWTAccessor;
+import sun.awt.AWTAccessor.ComponentAccessor;
 import java.awt.dnd.*;
 import java.awt.datatransfer.*;
 
@@ -182,7 +184,8 @@
         client.setBackground(new Color(30, 220, 40));
         clientCont.add(client);
         clientCont.validate();
-        WindowIDProvider pid = (WindowIDProvider)client.getPeer();
+        final ComponentAccessor acc = AWTAccessor.getComponentAccessor();
+        WindowIDProvider pid = (WindowIDProvider)acc.getPeer(client);
         log.fine("Added XEmbed server(Canvas) with X window ID " + pid.getWindow());
         Rectangle toFocusBounds = toFocus.getBounds();
         toFocusBounds.setLocation(toFocus.getLocationOnScreen());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/beans/Introspector/Test8027905.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/beans/Introspector/Test8027905.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/beans/Introspector/Test8027905.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/beans/Introspector/Test8027905.java	2021-09-01 14:33:15.000000000 +0000
@@ -28,6 +28,7 @@
  * @bug 8027905
  * @summary Tests that GC does not affect a property type
  * @author Sergey Malenkov
+ * @run main/othervm -mx16m Test8027905
  */
 
 public class Test8027905 {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/beans/XMLEncoder/Test4625418.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/beans/XMLEncoder/Test4625418.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/beans/XMLEncoder/Test4625418.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/beans/XMLEncoder/Test4625418.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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
@@ -26,332 +26,338 @@
  * @bug 4625418
  * @summary Tests XML <a href="http://download.java.net/jdk6/docs/technotes/guides/intl/encoding.doc.html">encoding</a>
  * @author Sergey Malenkov
- *
- * @run main Test4625418 ASCII
- * @run main Test4625418 Big5
- * ?run main Test4625418 Big5-HKSCS
- * ?run main Test4625418 Big5_HKSCS
- * @run main Test4625418 Big5_Solaris
- * ?run main Test4625418 Cp037
- * @run main Test4625418 Cp1006
- * ?run main Test4625418 Cp1025
- * -run main Test4625418 Cp1026
- * @run main Test4625418 Cp1046
- * @run main Test4625418 Cp1047
- * @run main Test4625418 Cp1097
- * @run main Test4625418 Cp1098
- * ?run main Test4625418 Cp1112
- * ?run main Test4625418 Cp1122
- * ?run main Test4625418 Cp1123
- * @run main Test4625418 Cp1124
- * ?run main Test4625418 Cp1140
- * ?run main Test4625418 Cp1141
- * ?run main Test4625418 Cp1142
- * ?run main Test4625418 Cp1143
- * ?run main Test4625418 Cp1144
- * ?run main Test4625418 Cp1145
- * ?run main Test4625418 Cp1146
- * ?run main Test4625418 Cp1147
- * ?run main Test4625418 Cp1148
- * ?run main Test4625418 Cp1149
- * @run main Test4625418 Cp1250
- * @run main Test4625418 Cp1251
- * @run main Test4625418 Cp1252
- * @run main Test4625418 Cp1253
- * @run main Test4625418 Cp1254
- * @run main Test4625418 Cp1255
- * @run main Test4625418 Cp1256
- * @run main Test4625418 Cp1257
- * @run main Test4625418 Cp1258
- * ?run main Test4625418 Cp1381
- * ?run main Test4625418 Cp1383
- * ?run main Test4625418 Cp273
- * ?run main Test4625418 Cp277
- * ?run main Test4625418 Cp278
- * ?run main Test4625418 Cp280
- * ?run main Test4625418 Cp284
- * ?run main Test4625418 Cp285
- * ?run main Test4625418 Cp297
- * ?run main Test4625418 Cp33722
- * ?run main Test4625418 Cp420
- * ?run main Test4625418 Cp424
- * @run main Test4625418 Cp437
- * ?run main Test4625418 Cp500
- * ?run main Test4625418 Cp50220
- * ?run main Test4625418 Cp50221
- * @run main Test4625418 Cp737
- * @run main Test4625418 Cp775
- * -run main Test4625418 Cp834
- * ?run main Test4625418 Cp838
- * @run main Test4625418 Cp850
- * @run main Test4625418 Cp852
- * @run main Test4625418 Cp855
- * @run main Test4625418 Cp856
- * @run main Test4625418 Cp857
- * @run main Test4625418 Cp858
- * @run main Test4625418 Cp860
- * @run main Test4625418 Cp861
- * @run main Test4625418 Cp862
- * @run main Test4625418 Cp863
- * @run main Test4625418 Cp864
- * @run main Test4625418 Cp865
- * @run main Test4625418 Cp866
- * @run main Test4625418 Cp868
- * @run main Test4625418 Cp869
- * ?run main Test4625418 Cp870
- * ?run main Test4625418 Cp871
- * @run main Test4625418 Cp874
- * ?run main Test4625418 Cp875
- * ?run main Test4625418 Cp918
- * @run main Test4625418 Cp921
- * @run main Test4625418 Cp922
- * -run main Test4625418 Cp930
- * @run main Test4625418 Cp933
- * ?run main Test4625418 Cp935
- * ?run main Test4625418 Cp937
- * ?run main Test4625418 Cp939
- * ?run main Test4625418 Cp942
- * ?run main Test4625418 Cp942C
- * @run main Test4625418 Cp943
- * ?run main Test4625418 Cp943C
- * @run main Test4625418 Cp948
- * @run main Test4625418 Cp949
- * ?run main Test4625418 Cp949C
- * @run main Test4625418 Cp950
- * @run main Test4625418 Cp964
- * ?run main Test4625418 Cp970
- * ?run main Test4625418 EUC-JP
- * @run main Test4625418 EUC-KR
- * @run main Test4625418 EUC_CN
- * ?run main Test4625418 EUC_JP
- * ?run main Test4625418 EUC_JP_LINUX
- * ?run main Test4625418 EUC_JP_Solaris
- * @run main Test4625418 EUC_KR
- * ?run main Test4625418 EUC_TW
- * @run main Test4625418 GB18030
- * @run main Test4625418 GB2312
- * @run main Test4625418 GBK
- * ?run main Test4625418 IBM-Thai
- * @run main Test4625418 IBM00858
- * ?run main Test4625418 IBM01140
- * ?run main Test4625418 IBM01141
- * ?run main Test4625418 IBM01142
- * ?run main Test4625418 IBM01143
- * ?run main Test4625418 IBM01144
- * ?run main Test4625418 IBM01145
- * ?run main Test4625418 IBM01146
- * ?run main Test4625418 IBM01147
- * ?run main Test4625418 IBM01148
- * ?run main Test4625418 IBM01149
- * ?run main Test4625418 IBM037
- * -run main Test4625418 IBM1026
- * @run main Test4625418 IBM1047
- * ?run main Test4625418 IBM273
- * ?run main Test4625418 IBM277
- * ?run main Test4625418 IBM278
- * ?run main Test4625418 IBM280
- * ?run main Test4625418 IBM284
- * ?run main Test4625418 IBM285
- * ?run main Test4625418 IBM297
- * ?run main Test4625418 IBM420
- * ?run main Test4625418 IBM424
- * @run main Test4625418 IBM437
- * ?run main Test4625418 IBM500
- * @run main Test4625418 IBM775
- * @run main Test4625418 IBM850
- * @run main Test4625418 IBM852
- * @run main Test4625418 IBM855
- * @run main Test4625418 IBM857
- * @run main Test4625418 IBM860
- * @run main Test4625418 IBM861
- * @run main Test4625418 IBM862
- * @run main Test4625418 IBM863
- * @run main Test4625418 IBM864
- * @run main Test4625418 IBM865
- * @run main Test4625418 IBM866
- * @run main Test4625418 IBM868
- * @run main Test4625418 IBM869
- * ?run main Test4625418 IBM870
- * ?run main Test4625418 IBM871
- * ?run main Test4625418 IBM918
- * ?run main Test4625418 ISCII91
- * -run main Test4625418 ISO-2022-CN
- * @run main Test4625418 ISO-2022-JP
- * @run main Test4625418 ISO-2022-KR
- * @run main Test4625418 ISO-8859-1
- * @run main Test4625418 ISO-8859-13
- * @run main Test4625418 ISO-8859-15
- * @run main Test4625418 ISO-8859-2
- * @run main Test4625418 ISO-8859-3
- * @run main Test4625418 ISO-8859-4
- * @run main Test4625418 ISO-8859-5
- * @run main Test4625418 ISO-8859-6
- * @run main Test4625418 ISO-8859-7
- * @run main Test4625418 ISO-8859-8
- * @run main Test4625418 ISO-8859-9
- * -run main Test4625418 ISO2022CN
- * @run main Test4625418 ISO2022JP
- * @run main Test4625418 ISO2022KR
- * -run main Test4625418 ISO2022_CN_CNS
- * -run main Test4625418 ISO2022_CN_GB
- * @run main Test4625418 ISO8859_1
- * @run main Test4625418 ISO8859_13
- * @run main Test4625418 ISO8859_15
- * @run main Test4625418 ISO8859_2
- * @run main Test4625418 ISO8859_3
- * @run main Test4625418 ISO8859_4
- * @run main Test4625418 ISO8859_5
- * @run main Test4625418 ISO8859_6
- * @run main Test4625418 ISO8859_7
- * @run main Test4625418 ISO8859_8
- * @run main Test4625418 ISO8859_9
- * -run main Test4625418 JISAutoDetect
- * ?run main Test4625418 JIS_X0201
- * -run main Test4625418 JIS_X0212-1990
- * @run main Test4625418 KOI8-R
- * @run main Test4625418 KOI8-U
- * @run main Test4625418 KOI8_R
- * @run main Test4625418 KOI8_U
- * @run main Test4625418 MS874
- * ?run main Test4625418 MS932
- * ?run main Test4625418 MS936
- * @run main Test4625418 MS949
- * @run main Test4625418 MS950
- * ?run main Test4625418 MS950_HKSCS
- * @run main Test4625418 MacArabic
- * @run main Test4625418 MacCentralEurope
- * @run main Test4625418 MacCroatian
- * @run main Test4625418 MacCyrillic
- * -run main Test4625418 MacDingbat
- * @run main Test4625418 MacGreek
- * @run main Test4625418 MacHebrew
- * @run main Test4625418 MacIceland
- * @run main Test4625418 MacRoman
- * @run main Test4625418 MacRomania
- * -run main Test4625418 MacSymbol
- * @run main Test4625418 MacThai
- * @run main Test4625418 MacTurkish
- * @run main Test4625418 MacUkraine
- * ?run main Test4625418 PCK
- * ?run main Test4625418 SJIS
- * ?run main Test4625418 Shift_JIS
- * @run main Test4625418 TIS-620
- * @run main Test4625418 TIS620
- * @run main Test4625418 US-ASCII
- * @run main Test4625418 UTF-16
- * @run main Test4625418 UTF-16BE
- * @run main Test4625418 UTF-16LE
- * @run main Test4625418 UTF-32
- * @run main Test4625418 UTF-32BE
- * @run main Test4625418 UTF-32LE
- * @run main Test4625418 UTF-8
- * @run main Test4625418 UTF8
- * @run main Test4625418 UTF_32
- * @run main Test4625418 UTF_32BE
- * -run main Test4625418 UTF_32BE_BOM
- * @run main Test4625418 UTF_32LE
- * -run main Test4625418 UTF_32LE_BOM
- * @run main Test4625418 UnicodeBig
- * @run main Test4625418 UnicodeBigUnmarked
- * @run main Test4625418 UnicodeLittle
- * @run main Test4625418 UnicodeLittleUnmarked
- * @run main Test4625418 windows-1250
- * @run main Test4625418 windows-1251
- * @run main Test4625418 windows-1252
- * @run main Test4625418 windows-1253
- * @run main Test4625418 windows-1254
- * @run main Test4625418 windows-1255
- * @run main Test4625418 windows-1256
- * @run main Test4625418 windows-1257
- * @run main Test4625418 windows-1258
- * ?run main Test4625418 windows-31j
- * -run main Test4625418 x-Big5_Solaris
- * ?run main Test4625418 x-EUC-TW
- * @run main Test4625418 x-IBM1006
- * ?run main Test4625418 x-IBM1025
- * @run main Test4625418 x-IBM1046
- * @run main Test4625418 x-IBM1097
- * @run main Test4625418 x-IBM1098
- * ?run main Test4625418 x-IBM1112
- * ?run main Test4625418 x-IBM1122
- * ?run main Test4625418 x-IBM1123
- * @run main Test4625418 x-IBM1124
- * ?run main Test4625418 x-IBM1381
- * ?run main Test4625418 x-IBM1383
- * ?run main Test4625418 x-IBM33722
- * @run main Test4625418 x-IBM737
- * -run main Test4625418 x-IBM834
- * @run main Test4625418 x-IBM856
- * @run main Test4625418 x-IBM874
- * ?run main Test4625418 x-IBM875
- * @run main Test4625418 x-IBM921
- * @run main Test4625418 x-IBM922
- * -run main Test4625418 x-IBM930
- * @run main Test4625418 x-IBM933
- * ?run main Test4625418 x-IBM935
- * ?run main Test4625418 x-IBM937
- * ?run main Test4625418 x-IBM939
- * ?run main Test4625418 x-IBM942
- * ?run main Test4625418 x-IBM942C
- * @run main Test4625418 x-IBM943
- * ?run main Test4625418 x-IBM943C
- * @run main Test4625418 x-IBM948
- * @run main Test4625418 x-IBM949
- * ?run main Test4625418 x-IBM949C
- * @run main Test4625418 x-IBM950
- * @run main Test4625418 x-IBM964
- * ?run main Test4625418 x-IBM970
- * ?run main Test4625418 x-ISCII91
- * -run main Test4625418 x-ISO2022-CN-CNS
- * -run main Test4625418 x-ISO2022-CN-GB
- * -run main Test4625418 x-JIS0208
- * -run main Test4625418 x-JISAutoDetect
- * @run main Test4625418 x-Johab
- * ?run main Test4625418 x-MS950-HKSCS
- * @run main Test4625418 x-MacArabic
- * @run main Test4625418 x-MacCentralEurope
- * @run main Test4625418 x-MacCroatian
- * @run main Test4625418 x-MacCyrillic
- * -run main Test4625418 x-MacDingbat
- * @run main Test4625418 x-MacGreek
- * @run main Test4625418 x-MacHebrew
- * @run main Test4625418 x-MacIceland
- * @run main Test4625418 x-MacRoman
- * @run main Test4625418 x-MacRomania
- * -run main Test4625418 x-MacSymbol
- * @run main Test4625418 x-MacThai
- * @run main Test4625418 x-MacTurkish
- * @run main Test4625418 x-MacUkraine
- * ?run main Test4625418 x-PCK
- * @run main Test4625418 x-UTF-16LE-BOM
- * -run main Test4625418 x-UTF-32BE-BOM
- * -run main Test4625418 x-UTF-32LE-BOM
- * ?run main Test4625418 x-euc-jp-linux
- * ?run main Test4625418 x-eucJP-Open
- * @run main Test4625418 x-iso-8859-11
- * @run main Test4625418 x-mswin-936
- * ?run main Test4625418 x-windows-50220
- * ?run main Test4625418 x-windows-50221
- * @run main Test4625418 x-windows-874
- * @run main Test4625418 x-windows-949
- * @run main Test4625418 x-windows-950
- * ?run main Test4625418 x-windows-iso2022jp
+ * @run main/timeout=360 Test4625418
  */
 
 import java.beans.ExceptionListener;
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 
 public final class Test4625418 implements ExceptionListener {
-    public static void main(String[] args) {
-        new Test4625418(args[0]).test(createString(0x10000));
-        System.out.println("Test passed: " + args[0]);
+
+    private static final String[] encodings = {
+        "ASCII",
+        "Big5",
+        //"Big5-HKSCS",
+        //"Big5_HKSCS",
+        "Big5_Solaris",
+        //"Cp037",
+        "Cp1006",
+        //"Cp1025",
+        //"Cp1026",
+        "Cp1046",
+        "Cp1047",
+        "Cp1097",
+        "Cp1098",
+        //"Cp1112",
+        //"Cp1122",
+        //"Cp1123",
+        "Cp1124",
+        //"Cp1140",
+        //"Cp1141",
+        //"Cp1142",
+        //"Cp1143",
+        //"Cp1144",
+        //"Cp1145",
+        //"Cp1146",
+        //"Cp1147",
+        //"Cp1148",
+        //"Cp1149",
+        "Cp1250",
+        "Cp1251",
+        "Cp1252",
+        "Cp1253",
+        "Cp1254",
+        "Cp1255",
+        "Cp1256",
+        "Cp1257",
+        "Cp1258",
+        //"Cp1381",
+        //"Cp1383",
+        //"Cp273",
+        //"Cp277",
+        //"Cp278",
+        //"Cp280",
+        //"Cp284",
+        //"Cp285",
+        //"Cp297",
+        //"Cp33722",
+        //"Cp420",
+        //"Cp424",
+        "Cp437",
+        //"Cp500",
+        //"Cp50220",
+        //"Cp50221",
+        "Cp737",
+        "Cp775",
+        //"Cp834",
+        //"Cp838",
+        "Cp850",
+        "Cp852",
+        "Cp855",
+        "Cp856",
+        "Cp857",
+        "Cp858",
+        "Cp860",
+        "Cp861",
+        "Cp862",
+        "Cp863",
+        "Cp864",
+        "Cp865",
+        "Cp866",
+        "Cp868",
+        "Cp869",
+        //"Cp870",
+        //"Cp871",
+        "Cp874",
+        //"Cp875",
+        //"Cp918",
+        "Cp921",
+        "Cp922",
+        //"Cp930",
+        "Cp933",
+        //"Cp935",
+        //"Cp937",
+        //"Cp939",
+        //"Cp942",
+        //"Cp942C",
+        "Cp943",
+        //"Cp943C",
+        "Cp948",
+        "Cp949",
+        //"Cp949C",
+        "Cp950",
+        "Cp964",
+        //"Cp970",
+        //"EUC-JP",
+        "EUC-KR",
+        "EUC_CN",
+        //"EUC_JP",
+        //"EUC_JP_LINUX",
+        //"EUC_JP_Solaris",
+        "EUC_KR",
+        //"EUC_TW",
+        "GB18030",
+        "GB2312",
+        "GBK",
+        //"IBM-Thai",
+        "IBM00858",
+        //"IBM01140",
+        //"IBM01141",
+        //"IBM01142",
+        //"IBM01143",
+        //"IBM01144",
+        //"IBM01145",
+        //"IBM01146",
+        //"IBM01147",
+        //"IBM01148",
+        //"IBM01149",
+        //"IBM037",
+        //"IBM1026",
+        "IBM1047",
+        //"IBM273",
+        //"IBM277",
+        //"IBM278",
+        //"IBM280",
+        //"IBM284",
+        //"IBM285",
+        //"IBM297",
+        //"IBM420",
+        //"IBM424",
+        "IBM437",
+        //"IBM500",
+        "IBM775",
+        "IBM850",
+        "IBM852",
+        "IBM855",
+        "IBM857",
+        "IBM860",
+        "IBM861",
+        "IBM862",
+        "IBM863",
+        "IBM864",
+        "IBM865",
+        "IBM866",
+        "IBM868",
+        "IBM869",
+        //"IBM870",
+        //"IBM871",
+        //"IBM918",
+        //"ISCII91",
+        //"ISO-2022-CN",
+        "ISO-2022-JP",
+        "ISO-2022-KR",
+        "ISO-8859-1",
+        "ISO-8859-13",
+        "ISO-8859-15",
+        "ISO-8859-2",
+        "ISO-8859-3",
+        "ISO-8859-4",
+        "ISO-8859-5",
+        "ISO-8859-6",
+        "ISO-8859-7",
+        "ISO-8859-8",
+        "ISO-8859-9",
+        //"ISO2022CN",
+        "ISO2022JP",
+        "ISO2022KR",
+        //"ISO2022_CN_CNS",
+        //"ISO2022_CN_GB",
+        "ISO8859_1",
+        "ISO8859_13",
+        "ISO8859_15",
+        "ISO8859_2",
+        "ISO8859_3",
+        "ISO8859_4",
+        "ISO8859_5",
+        "ISO8859_6",
+        "ISO8859_7",
+        "ISO8859_8",
+        "ISO8859_9",
+        //"JISAutoDetect",
+        //"JIS_X0201",
+        //"JIS_X0212-1990",
+        "KOI8-R",
+        "KOI8-U",
+        "KOI8_R",
+        "KOI8_U",
+        "MS874",
+        //"MS932",
+        //"MS936",
+        "MS949",
+        "MS950",
+        //"MS950_HKSCS",
+        "MacArabic",
+        "MacCentralEurope",
+        "MacCroatian",
+        "MacCyrillic",
+        //"MacDingbat",
+        "MacGreek",
+        "MacHebrew",
+        "MacIceland",
+        "MacRoman",
+        "MacRomania",
+        //"MacSymbol",
+        "MacThai",
+        "MacTurkish",
+        "MacUkraine",
+        //"PCK",
+        //"SJIS",
+        //"Shift_JIS",
+        "TIS-620",
+        "TIS620",
+        "US-ASCII",
+        "UTF-16",
+        "UTF-16BE",
+        "UTF-16LE",
+        "UTF-32",
+        "UTF-32BE",
+        "UTF-32LE",
+        "UTF-8",
+        "UTF8",
+        "UTF_32",
+        "UTF_32BE",
+        //"UTF_32BE_BOM",
+        "UTF_32LE",
+        //"UTF_32LE_BOM",
+        "UnicodeBig",
+        "UnicodeBigUnmarked",
+        "UnicodeLittle",
+        "UnicodeLittleUnmarked",
+        "windows-1250",
+        "windows-1251",
+        "windows-1252",
+        "windows-1253",
+        "windows-1254",
+        "windows-1255",
+        "windows-1256",
+        "windows-1257",
+        "windows-1258",
+        //"windows-31j",
+        //"x-Big5_Solaris",
+        //"x-EUC-TW",
+        "x-IBM1006",
+        //"x-IBM1025",
+        "x-IBM1046",
+        "x-IBM1097",
+        "x-IBM1098",
+        //"x-IBM1112",
+        //"x-IBM1122",
+        //"x-IBM1123",
+        "x-IBM1124",
+        //"x-IBM1381",
+        //"x-IBM1383",
+        //"x-IBM33722",
+        "x-IBM737",
+        //"x-IBM834",
+        "x-IBM856",
+        "x-IBM874",
+        //"x-IBM875",
+        "x-IBM921",
+        "x-IBM922",
+        //"x-IBM930",
+        "x-IBM933",
+        //"x-IBM935",
+        //"x-IBM937",
+        //"x-IBM939",
+        //"x-IBM942",
+        //"x-IBM942C",
+        "x-IBM943",
+        //"x-IBM943C",
+        "x-IBM948",
+        "x-IBM949",
+        //"x-IBM949C",
+        "x-IBM950",
+        "x-IBM964",
+        //"x-IBM970",
+        //"x-ISCII91",
+        //"x-ISO2022-CN-CNS",
+        //"x-ISO2022-CN-GB",
+        //"x-JIS0208",
+        //"x-JISAutoDetect",
+        "x-Johab",
+        //"x-MS950-HKSCS",
+        "x-MacArabic",
+        "x-MacCentralEurope",
+        "x-MacCroatian",
+        "x-MacCyrillic",
+        //"x-MacDingbat",
+        "x-MacGreek",
+        "x-MacHebrew",
+        "x-MacIceland",
+        "x-MacRoman",
+        "x-MacRomania",
+        //"x-MacSymbol",
+        "x-MacThai",
+        "x-MacTurkish",
+        "x-MacUkraine",
+        //"x-PCK",
+        "x-UTF-16LE-BOM",
+        //"x-UTF-32BE-BOM",
+        //"x-UTF-32LE-BOM",
+        //"x-euc-jp-linux",
+        //"x-eucJP-Open",
+        "x-iso-8859-11",
+        "x-mswin-936",
+        //"x-windows-50220",
+        //"x-windows-50221",
+        "x-windows-874",
+        "x-windows-949",
+        "x-windows-950",
+        //"x-windows-iso2022jp",
+    };
+
+    public static void main(final String[] args) {
+        final String string = createString(0x10000);
+        for (String encoding : encodings) {
+            System.out.println("Test encoding: " + encoding);
+            new Test4625418(encoding).test(string);
+        }
     }
 
     private static String createString(int length) {
@@ -364,33 +370,27 @@
 
     private final String encoding;
 
-    private Test4625418(String encoding) {
+    private Test4625418(final String encoding) {
         this.encoding = encoding;
     }
 
     private void test(String string) {
         try {
-            File file = new File("4625418." + this.encoding + ".xml");
-
-            FileOutputStream output = new FileOutputStream(file);
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
             XMLEncoder encoder = new XMLEncoder(output, this.encoding, true, 0);
             encoder.setExceptionListener(this);
             encoder.writeObject(string);
             encoder.close();
 
-            FileInputStream input = new FileInputStream(file);
+            InputStream input = new ByteArrayInputStream(output.toByteArray());
             XMLDecoder decoder = new XMLDecoder(input);
             decoder.setExceptionListener(this);
             Object object = decoder.readObject();
             decoder.close();
 
-            if (!string.equals(object))
+            if (!string.equals(object)) {
                 throw new Error(this.encoding + " - can't read properly");
-
-            file.delete();
-        }
-        catch (FileNotFoundException exception) {
-            throw new Error(this.encoding + " - file not found", exception);
+            }
         }
         catch (IllegalCharsetNameException exception) {
             throw new Error(this.encoding + " - illegal charset name", exception);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/io/File/SetLastModified.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/io/File/SetLastModified.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/io/File/SetLastModified.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/io/File/SetLastModified.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 4091757 6652379
+   @bug 4091757 6652379 8177809
    @summary Basic test for setLastModified method
  */
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/HttpURLConnection/HttpURLConWithProxy.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/HttpURLConnection/HttpURLConWithProxy.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/HttpURLConnection/HttpURLConWithProxy.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/HttpURLConnection/HttpURLConWithProxy.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*
+ * @test
+ * @bug 8161016
+ * @summary When proxy is set HttpURLConnection should not use DIRECT connection.
+ * @run main/othervm HttpURLConWithProxy
+ */
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.ServerSocket;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+
+public class HttpURLConWithProxy {
+
+    public static void main(String... arg) {
+        // Remove the default nonProxyHosts to use localhost for testing
+        System.setProperty("http.nonProxyHosts", "");
+
+        System.setProperty("http.proxyHost", "1.1.1.1");
+        System.setProperty("http.proxyPort", "1111");
+
+        ServerSocket ss;
+        URL url;
+        URLConnection con;
+
+        // Test1: using Proxy set by System Property:
+        try {
+            ss = new ServerSocket(0);
+            url = new URL("http://localhost:" + ss.getLocalPort());
+            con = url.openConnection();
+            con.setConnectTimeout(10 * 1000);
+            con.connect();
+            throw new RuntimeException("Shouldn't use DIRECT connection "
+                    + "when proxy is invalid/down");
+        } catch (IOException ie) {
+            System.out.println("Test1 Passed with: " + ie.getMessage());
+        }
+
+        // Test2: using custom ProxySelector implementation
+        MyProxySelector myProxySel = new MyProxySelector();
+        ProxySelector.setDefault(myProxySel);
+        try {
+            ss = new ServerSocket(0);
+            url = new URL("http://localhost:" + ss.getLocalPort());
+            con = url.openConnection();
+            con.setConnectTimeout(10 * 1000);
+            con.connect();
+            throw new RuntimeException("Shouldn't use DIRECT connection "
+                    + "when proxy is invalid/down");
+        } catch (IOException ie) {
+            System.out.println("Test2 Passed with: " + ie.getMessage());
+        }
+    }
+}
+
+
+class MyProxySelector extends ProxySelector {
+
+    List<Proxy> proxies = new ArrayList<>();
+
+    MyProxySelector() {
+        Proxy p1 = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("2.2.2.2", 2222));
+        Proxy p2 = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("3.3.3.3", 3333));
+        proxies.add(p1);
+        proxies.add(p2);
+    }
+
+    @Override
+    public List<Proxy> select(URI uri) {
+        return proxies;
+    }
+
+    @Override
+    public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+        // System.out.println("MyProxySelector.connectFailed(): "+sa);
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/ipv6tests/Tests.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/ipv6tests/Tests.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/ipv6tests/Tests.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/ipv6tests/Tests.java	2021-09-01 14:33:15.000000000 +0000
@@ -26,6 +26,9 @@
 import java.util.*;
 
 public class Tests {
+
+    static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
     /**
      * performs a simple exchange of data between the two sockets
      * and throws an exception if there is any problem.
@@ -270,6 +273,12 @@
             if (ifs != null) {
                 while (ifs.hasMoreElements()) {
                     NetworkInterface nic = (NetworkInterface)ifs.nextElement();
+                    // Skip (Windows)Teredo Tunneling Pseudo-Interface
+                    if (isWindows) {
+                        String dName = nic.getDisplayName();
+                        if (dName != null && dName.contains("Teredo"))
+                            continue;
+                    }
                     try {
                         if (nic.isUp() && !nic.isLoopback())
                             return nic;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/MulticastSocket/TestInterfaces.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/MulticastSocket/TestInterfaces.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/net/MulticastSocket/TestInterfaces.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/net/MulticastSocket/TestInterfaces.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -26,10 +26,15 @@
  * @bug 4422122
  * @summary Test that MulticastSocket.getInterface returns the
  *          same InetAddress set by MulticastSocket.setInterface
+ * @library /lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ * @run main TestInterfaces
  */
 import java.net.*;
 import java.util.Enumeration;
 import java.io.IOException;
+import jdk.test.lib.NetworkConfiguration;
 
 public class TestInterfaces {
 
@@ -44,6 +49,10 @@
         while (nifs.hasMoreElements()) {
             NetworkInterface ni = (NetworkInterface)nifs.nextElement();
 
+            // Skip those interfaces not up or not support multicast
+            if (!ni.isUp() || !ni.supportsMulticast())
+                continue;
+
             /*
              * Test MulticastSocket.getInterface
              */
@@ -104,6 +113,8 @@
         }
 
         if (failures > 0) {
+            System.err.println("********************************");
+            NetworkConfiguration.printSystemConfiguration(System.err);
             System.out.println("********************************");
             throw new Exception(failures + " test(s) failed!!!");
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/nio/channels/SocketChannel/AdaptSocketReadAfterClose.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/nio/channels/SocketChannel/AdaptSocketReadAfterClose.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/nio/channels/SocketChannel/AdaptSocketReadAfterClose.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/nio/channels/SocketChannel/AdaptSocketReadAfterClose.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
+/*
+ * @test
+ * @bug 8260875
+ * @summary Reading a closed SocketChannel should throw a ClosedChannelException
+ * @run testng AdaptSocketReadAfterClose
+ */
+
+public class AdaptSocketReadAfterClose {
+
+    @Test
+    public void testReadAfterClose() throws InterruptedException, IOException {
+        ServerSocketChannel ssc = ServerSocketChannel.open();
+        ssc.bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
+        SocketAddress saddr = ssc.getLocalAddress();
+
+        SocketChannel channel = SocketChannel.open(saddr);
+        channel.configureBlocking(false);
+        Socket s = channel.socket();
+        InputStream is = s.getInputStream();
+        channel.close();
+
+        byte[] buf = new byte[10];
+        Throwable ex = Assert.expectThrows(ClosedChannelException.class, () -> is.read(buf));
+        Assert.assertEquals(ex.getClass(), ClosedChannelException.class);
+        ssc.close();
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -262,7 +262,7 @@
                              e.getClass().getName(), e);
 
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             obj = null;
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkActivateRef/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -30,8 +30,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -130,7 +130,7 @@
 
             myRMI = null;
             System.err.println("rmid shut down");
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkAnnotations/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -112,7 +112,7 @@
 
             myRMI = null;
             System.err.println("rmid shut down");
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             TestLibrary.unexport(group);
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -33,8 +33,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -164,7 +164,7 @@
             throw new RuntimeException("CheckRegisterInLog got exception " +
                                        e.getMessage());
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -155,7 +155,7 @@
                              e.getClass().getName(), e);
 
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             obj = null;
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -138,7 +138,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -32,8 +32,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -135,7 +135,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -31,8 +31,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -69,7 +69,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -18,8 +18,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -248,7 +248,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             for (int i = 0 ; i < HOW_MANY ; i ++) {
                 TestLibrary.unexport(unicastObjs[i]);
             }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -174,7 +174,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/inactiveGroup/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -118,7 +118,7 @@
 
 
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -165,7 +165,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nestedActivate/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -139,7 +139,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -231,7 +231,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             TestLibrary.unexport(unicastObj);
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartCrashedService/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -247,7 +247,7 @@
         } catch (Exception e) {
             TestLibrary.bomb(e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             TestLibrary.unexport(callbackObj);
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartLatecomer/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/RestartService.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/RestartService.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/RestartService.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/RestartService.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -221,7 +221,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             TestLibrary.unexport(unicastObj);
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/restartService/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4183169
+ * @bug 4183169 8032050
  * @summary Minor problem with the way ReliableLog handles IOExceptions.
  *
  * @author Laird Dornin; code borrowed from Ann Wollrath
@@ -36,6 +36,7 @@
 import java.rmi.activation.*;
 import java.rmi.*;
 import java.util.Properties;
+import java.util.concurrent.TimeoutException;
 
 /**
  * The test creates an rmid with a special security manager.  After
@@ -51,7 +52,7 @@
  * (after that time, the test will fail).
  */
 public class ShutdownGracefully
-    extends Activatable implements Runnable, RegisteringActivatable
+    extends Activatable implements RegisteringActivatable
 {
     private static RegisteringActivatable registering = null;
 
@@ -61,6 +62,8 @@
 
         RMID rmid = null;
 
+        // Save exception if there is a exception or expected behavior
+        Exception exception = null;
         System.err.println("\nRegression test for bug/rfe 4183169\n");
 
         try {
@@ -132,101 +135,37 @@
             desc = new ActivationDesc(secondGroupID,
                 "ShutdownGracefully", null, null);
 
+            /*
+             * registration request is expected to be failed. succeeded case
+             * should be recorded. And raise error after clean up  rmid.
+             */
             try {
                 registering = (RegisteringActivatable)
                     Activatable.register(desc);
-
-                System.err.println("second activate and deactivate " +
-                                   "object via method call");
+                System.err.println("The registration request succeeded unexpectedly");
+                exception = new RuntimeException("The registration request succeeded unexpectedly");
             } catch (ActivationException e) {
                 System.err.println("received exception from registration " +
                                    "call that should have failed...");
-            }
-
-            /*
-             * no longer needed because the security manager
-             * throws an exception during snapshot
-             */
-            /*
-            try {
-                registering.shutdown();
-
-                System.err.println("received exception from remote " +
-                                   "call that should have failed...");
-            } catch (RemoteException e) {
-            }
-            */
-
-        } catch (Exception e) {
-            TestLibrary.bomb("\nfailure: unexpected exception ", e);
-        } finally {
-            try {
-                Thread.sleep(4000);
-            } catch (InterruptedException e) {
-            }
-
-            registering = null;
-
-            // Need to make sure that rmid goes away by itself
-            JavaVM rmidProcess = rmid;
-            if (rmidProcess != null) {
+                // Need wait rmid process terminates.
                 try {
-                    Runnable waitThread =
-                        new ShutdownDetectThread(rmidProcess);
-
-                    synchronized (waitThread) {
-                        (new Thread(waitThread)).start();
-                        waitThread.wait(SHUTDOWN_TIMEOUT);
-                        System.err.println("rmid has shutdown");
-
-                        if (!rmidDone) {
-                            // ensure that this rmid does not infect
-                            // other tests.
-                            rmidProcess.destroy();
-                            TestLibrary.bomb("rmid did not shutdown " +
-                                             "gracefully in time");
-                        }
-                    }
-                } catch (Exception e) {
-                    TestLibrary.bomb("exception waiting for rmid " +
-                                     "to shut down");
+                    int exitCode = rmid.waitFor(SHUTDOWN_TIMEOUT);
+                    System.err.println("RMID has exited gracefully with exitcode:" + exitCode);
+                    rmid = null;
+                } catch (TimeoutException te) {
+                    System.err.println("RMID process has not exited in given time");
+                    exception = te;
                 }
             }
-            // else rmid should be down
-        }
-
-        System.err.println
-            ("\nsuccess: ShutdownGracefully test passed ");
-    }
-
-    private static boolean rmidDone = false;
-
-    /**
-     * class that waits for rmid to exit
-     */
-    private static class ShutdownDetectThread implements Runnable {
-        private JavaVM rmidProcess = null;
-
-        ShutdownDetectThread(JavaVM rmidProcess) {
-            this.rmidProcess = rmidProcess;
-        }
-        public void run() {
-            System.err.println("waiting for rmid to shutdown");
-
-            try {
-                rmidProcess.waitFor();
-            } catch (InterruptedException e) {
-                // should not happen
-            }
-
-            synchronized (this) {
-                // notify parent thread when rmid has exited
-                this.notify();
-                rmidDone = true;
-            }
-
-            RMID.removeLog();
+        } catch (Exception e) {
+            System.err.println("Exception thrown:" + e);
+            exception = e;
+        } finally {
+            if (rmid != null)
+                rmid.destroy();
         }
+        if (exception != null)
+            TestLibrary.bomb("\nexception thrown in test: ", exception);
     }
 
     /**
@@ -240,23 +179,12 @@
     }
 
     /**
-     * Spawns a thread to deactivate the object.
+     * Deactivates the object. We need to unexport forcibly because this call
+     * in-progress on this object, which is the same object that we are trying
+     * to deactivate.
      */
     public void shutdown() throws Exception {
-        (new Thread(this, "ShutdownGracefully")).start();
-    }
-
-    /**
-     * Thread to deactivate object. First attempts to make object
-     * inactive (via the inactive method).  If that fails (the
-     * object may still have pending/executing calls), then
-     * unexport the object forcibly.
-     */
-    public void run() {
-        try {
-            Thread.sleep(50 * 1000);
-        } catch (InterruptedException e) {
-        }
+        Activatable.unexportObject(this, true);
         ActivationLibrary.deactivate(this, getID());
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -125,7 +125,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -163,7 +163,7 @@
 
         } finally {
             obj1 = obj2 = null;
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -156,7 +156,7 @@
         } catch (Exception e) {
             TestLibrary.bomb(e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -108,7 +108,7 @@
             } catch (NoSuchObjectException unexpected) {
                 throw new AssertionError(unexpected);
             }
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -16,8 +16,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -250,7 +250,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -171,7 +171,7 @@
             }
 
             canCreateStubs = null;
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
             System.err.println("rmid shut down");
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -22,8 +22,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -156,7 +156,7 @@
         } catch (Exception e) {
             TestLibrary.bomb("test failed", e);
         } finally {
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -23,8 +23,7 @@
   permission java.util.PropertyPermission "java.compiler", "read";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
   permission java.util.PropertyPermission "java.rmi.activation.port", "write";
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -203,7 +203,7 @@
         actsys.unregisterGroup(gid);
 
         Thread.sleep(5000);
-        ActivationLibrary.rmidCleanup(rmid);
+        rmid.cleanup();
     }
 
     public static class DebugExecWatcher
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -121,7 +121,7 @@
             if (obj != null) {
                 UnicastRemoteObject.unexportObject(obj, true);
             }
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -119,7 +119,7 @@
             if (obj != null) {
                 UnicastRemoteObject.unexportObject(obj, true);
             }
-            ActivationLibrary.rmidCleanup(rmid);
+            rmid.cleanup();
         }
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/dgc/VMID/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/dgc/VMID/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/dgc/VMID/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/dgc/VMID/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -9,8 +9,7 @@
 grant {
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java	2021-09-01 14:33:15.000000000 +0000
@@ -104,13 +104,6 @@
                                utilityToStart + " to die");
 
             if (time >= TIME_OUT) {
-
-                // dont pollute other tests; increase the likelihood
-                // that rmid will go away if it did not exit already.
-                if (utility.equals(ACTIVATION)) {
-                    RMID.shutdown(port);
-                }
-
                 TestLibrary.bomb(utilityToStart +
                                  " took too long to die...");
             } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/registry/classPathCodebase/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/registry/classPathCodebase/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/registry/classPathCodebase/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/registry/classPathCodebase/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -15,8 +15,7 @@
   permission java.io.FilePermission ".${/}-", "read,write,delete";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -19,8 +19,7 @@
   permission java.io.FilePermission ".${/}codebase${/}-", "read,write,delete";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -17,8 +17,7 @@
 	".${/}-", "read,write,delete";
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -14,8 +14,7 @@
 	".${/}-", "read,write,delete";
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -20,8 +20,7 @@
     permission java.lang.reflect.ReflectPermission "newProxyInPackage.java.util.zip";
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/spi/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/spi/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/spi/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/spi/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -17,8 +17,7 @@
 	".${/}-", "read,write,delete";
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -21,8 +21,7 @@
 	".${/}-", "read,write,delete";
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -16,8 +16,7 @@
   permission java.io.FilePermission ".${/}-", "read,write,delete";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -25,8 +25,7 @@
   permission java.util.PropertyPermission "java.security.manager", "read";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -58,7 +58,7 @@
         RMID rmid = null;
 
         try {
-            rmid = RMID.createRMID(true);
+            rmid = RMID.createRMID();
             rmid.addArguments(new String[] {
                 "-C-Djava.security.policy=" +
                     TestParams.defaultGroupPolicy +
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -17,8 +17,7 @@
   permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -17,8 +17,7 @@
   permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/useCustomRef/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/useCustomRef/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/server/useCustomRef/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/server/useCustomRef/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -17,8 +17,7 @@
   permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/ActivationLibrary.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/ActivationLibrary.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/ActivationLibrary.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/ActivationLibrary.java	2021-09-01 14:33:15.000000000 +0000
@@ -102,134 +102,4 @@
         } catch (NoSuchObjectException e) {
         }
     }
-
-    /**
-     * Simple method call to see if rmid is running.
-     *
-     * This method intentionally avoids performing a lookup on the
-     * activation system.
-     */
-    public static boolean rmidRunning(int port) {
-        int allowedNotReady = 50;
-        int connectionRefusedExceptions = 0;
-
-        /* We wait as much as a total of 7.5 secs trying to see Rmid running.
-         * We do this by pausing steps of 100 milliseconds (so up to 75 steps),
-         * right after trying to lookup and find RMID running in the other vm.
-         */
-        final long rmidWaitingStepTime = 100;
-        for (int i = 0; i <= 74; i++) {
-
-            try {
-                LocateRegistry.getRegistry(port).lookup(SYSTEM_NAME);
-                mesg("Activation System available after " +
-                     (i * rmidWaitingStepTime) + " milliseconds");
-                return true;
-
-            } catch (java.rmi.ConnectException e) {
-                mesg("Remote connection refused after " +
-                     (i * rmidWaitingStepTime) + " milliseconds");
-
-                // ignore connect exceptions until we decide rmid is not up
-                if ((connectionRefusedExceptions ++) >= allowedNotReady) {
-                    return false;
-                }
-
-            } catch (java.rmi.NoSuchObjectException nsoe) {
-                /* Activation System still unavailable.
-                 * Ignore this since we are just waiting for its availibility.
-                 * Just signal unavailibility.
-                 */
-                mesg("Activation System still unavailable after more than " +
-                     (i * rmidWaitingStepTime) + " milliseconds");
-
-            } catch (NotBoundException e) {
-                return false;
-
-            } catch (Exception e) {
-                /* print out other types of exceptions as an FYI.
-                 * test should not fail as rmid is likely to be in an
-                 * undetermined state at this point.
-                 */
-                mesg("caught an exception trying to" +
-                     " start rmid, last exception was: " +
-                     e.getMessage());
-                e.printStackTrace();
-            }
-
-            // Waiting for another 100 milliseconds.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                mesg("Thread interrupted while checking if Activation System is running. Exiting check");
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /** cleanup after rmid */
-    public static void rmidCleanup(RMID rmid) {
-        if (rmid != null) {
-            if (!ActivationLibrary.safeDestroy(rmid, SAFE_WAIT_TIME)) {
-                TestLibrary.bomb("rmid not destroyed in: " +
-                                 SAFE_WAIT_TIME +
-                                 " milliseconds");
-            }
-        }
-        RMID.removeLog();
-    }
-
-    /**
-     * Invoke shutdown on rmid in a way that will not cause a test
-     * to hang.
-     *
-     * @return whether or not shutdown completed succesfully in the
-     *         timeAllowed
-     */
-    private static boolean safeDestroy(RMID rmid, long timeAllowed) {
-        DestroyThread destroyThread = new DestroyThread(rmid);
-        destroyThread.start();
-
-        try {
-            destroyThread.join(timeAllowed);
-        } catch (InterruptedException ie) {
-            Thread.currentThread().interrupt();
-        }
-
-        return destroyThread.shutdownSucceeded();
-    }
-
-    /**
-     * Thread class to handle the destruction of rmid
-     */
-    private static class DestroyThread extends Thread {
-        private final RMID rmid;
-        private final int port;
-        private boolean succeeded = false;
-
-        DestroyThread(RMID rmid) {
-            this.rmid = rmid;
-            this.port = rmid.getPort();
-            this.setDaemon(true);
-        }
-
-        public void run() {
-            if (ActivationLibrary.rmidRunning(port)) {
-                rmid.destroy();
-                synchronized (this) {
-                    // flag that the test was able to shutdown rmid
-                    succeeded = true;
-                }
-                mesg("finished destroying rmid");
-            } else {
-                mesg("tried to shutdown when rmid was not running");
-            }
-        }
-
-        public synchronized boolean shutdownSucceeded() {
-            return succeeded;
-        }
-    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/JavaVM.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/JavaVM.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/JavaVM.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/JavaVM.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -26,6 +26,7 @@
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.StringTokenizer;
+import java.util.concurrent.TimeoutException;
 
 /**
  * RMI regression test utility class that uses Runtime.exec to spawn a
@@ -33,6 +34,8 @@
  */
 public class JavaVM {
 
+    public static final long POLLTIME_MS = 100L;
+
     protected Process vm = null;
 
     private String classname = "";
@@ -135,7 +138,11 @@
             addOptions(new String[] { option });
         }
 
-        addOptions(new String[] { getCodeCoverageOptions() });
+        addOptions(new String[] {
+            getCodeCoverageOptions(),
+            TestParams.testJavaOpts,
+            TestParams.testVmOpts
+        });
 
         StringTokenizer optionsTokenizer = new StringTokenizer(options);
         StringTokenizer argsTokenizer = new StringTokenizer(args);
@@ -185,6 +192,38 @@
     }
 
     /**
+     * Causes the current thread to wait the vm process to exit, if necessary,
+     * wait until the vm process has terminated, or the specified waiting time
+     * elapses. Release allocated input/output after vm process has terminated.
+     * @param timeout the maximum milliseconds to wait.
+     * @return exit value for vm process.
+     * @throws InterruptedException if the current thread is interrupted
+     *         while waiting.
+     * @throws TimeoutException if subprocess does not end after timeout
+     *         milliseconds passed
+     */
+    public int waitFor(long timeout)
+            throws InterruptedException, TimeoutException {
+        if (vm == null)
+            throw new IllegalStateException("can't wait for JavaVM that isn't running");
+        long deadline = System.currentTimeMillis() + timeout;
+
+        while (true) {
+            try {
+                int status = vm.exitValue();
+                outPipe.join();
+                errPipe.join();
+                return status;
+            } catch (IllegalThreadStateException ignore) { }
+
+            if (System.currentTimeMillis() > deadline)
+                throw new TimeoutException();
+
+            Thread.sleep(POLLTIME_MS);
+        }
+    }
+
+    /**
      * Starts the subprocess, waits for it to exit, and returns its exit status.
      */
     public int execute() throws IOException, InterruptedException {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/RMID.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/RMID.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/RMID.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/RMID.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -21,13 +21,11 @@
  * questions.
  */
 
-/**
- *
- */
-
 import java.io.*;
 import java.rmi.*;
 import java.rmi.activation.*;
+import java.rmi.registry.*;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Utility class that creates an instance of rmid with a policy
@@ -38,6 +36,17 @@
  */
 public class RMID extends JavaVM {
 
+    // TODO: adjust these based on the timeout factor
+    // such as jcov.sleep.multiplier; see start(long) method.
+    // Also consider the test.timeout.factor property (a float).
+    private static final long TIMEOUT_SHUTDOWN_MS = 60_000L;
+    private static final long TIMEOUT_DESTROY_MS  = 10_000L;
+    private static final long STARTTIME_MS        = 15_000L;
+    private static final long POLLTIME_MS         = 100L;
+
+    private static final String SYSTEM_NAME = ActivationSystem.class.getName();
+        // "java.rmi.activation.ActivationSystem"
+
     public static String MANAGER_OPTION="-Djava.security.manager=";
 
     /** Test port for rmid */
@@ -113,6 +122,18 @@
             args += " -C-Dtest.classes=" + TestParams.testClasses;
         }
 
+        if (!TestParams.testJavaOpts.equals("")) {
+            for (String a : TestParams.testJavaOpts.split(" +")) {
+                args += " -C" + a;
+            }
+        }
+
+        if (!TestParams.testVmOpts.equals("")) {
+            for (String a : TestParams.testVmOpts.split(" +")) {
+                args += " -C" + a;
+            }
+        }
+
         args += " -C-Djava.rmi.server.useCodebaseOnly=false ";
 
         args += " " + getCodeCoverageArgs();
@@ -124,15 +145,8 @@
      * policy file.
      */
     public static RMID createRMID() {
-        return createRMID(System.out, System.err, true);
-    }
-
-    public static RMID createRMID(boolean debugExec) {
-        return createRMID(System.out, System.err, debugExec);
-    }
-
-    public static RMID createRMID(OutputStream out, OutputStream err) {
-        return createRMID(out, err, true);
+        return createRMID(System.out, System.err, true, true,
+                          TestLibrary.getUnusedRandomPort());
     }
 
     public static RMID createRMID(OutputStream out, OutputStream err,
@@ -157,24 +171,24 @@
 
 
     /**
-     * Test RMID should be created with the createRMID method.
+     * Private constructor. RMID instances should be created
+     * using the static factory methods.
      */
-    protected RMID(String classname, String options, String args,
+    private RMID(String classname, String options, String args,
                    OutputStream out, OutputStream err, int port)
     {
         super(classname, options, args, out, err);
         this.port = port;
     }
 
+    /**
+     * Removes rmid's log file directory.
+     */
     public static void removeLog() {
-        /*
-         * Remove previous log file directory before
-         * starting up rmid.
-         */
         File f = new File(LOGDIR, log);
 
         if (f.exists()) {
-            mesg("removing rmid's old log file...");
+            mesg("Removing rmid's old log file.");
             String[] files = f.list();
 
             if (files != null) {
@@ -183,8 +197,8 @@
                 }
             }
 
-            if (f.delete() != true) {
-                mesg("\t" + " unable to delete old log file.");
+            if (! f.delete()) {
+                mesg("Warning: unable to delete old log file.");
             }
         }
     }
@@ -199,20 +213,40 @@
         return TestLibrary.getExtraProperty("rmid.jcov.args","");
     }
 
-    public void start() throws IOException {
-        start(10000);
+    /**
+     * Looks up the activation system in the registry on the given port,
+     * returning its stub, or null if it's not present. This method differs from
+     * ActivationGroup.getSystem() because this method looks on a specific port
+     * instead of using the java.rmi.activation.port property like
+     * ActivationGroup.getSystem() does. This method also returns null instead
+     * of throwing exceptions.
+     */
+    public static ActivationSystem lookupSystem(int port) {
+        try {
+            return (ActivationSystem)LocateRegistry.getRegistry(port).lookup(SYSTEM_NAME);
+        } catch (RemoteException | NotBoundException ex) {
+            return null;
+        }
     }
 
-    public void slowStart() throws IOException {
-        start(60000);
+    /**
+     * Starts rmid and waits up to the default timeout period
+     * to confirm that it's running.
+     */
+    public void start() throws IOException {
+        start(STARTTIME_MS);
     }
 
+    /**
+     * Starts rmid and waits up to the given timeout period
+     * to confirm that it's running.
+     */
     public void start(long waitTime) throws IOException {
 
         // if rmid is already running, then the test will fail with
         // a well recognized exception (port already in use...).
 
-        mesg("starting rmid on port #" + port + "...");
+        mesg("Starting rmid on port " + port + ".");
         super.start();
 
         int slopFactor = 1;
@@ -222,24 +256,30 @@
         } catch (NumberFormatException ignore) {}
         waitTime = waitTime * slopFactor;
 
-        // We check several times (as many as provides passed waitTime) to
-        // see if Rmid is currently running. Waiting steps last 100 msecs.
-        final long rmidStartSleepTime = 100;
-        do {
-            // Sleeping for another rmidStartSleepTime time slice.
+        long startTime = System.currentTimeMillis();
+        long deadline = startTime + waitTime;
+
+        while (true) {
             try {
-                Thread.sleep(Math.min(waitTime, rmidStartSleepTime));
+                Thread.sleep(POLLTIME_MS);
             } catch (InterruptedException ie) {
                 Thread.currentThread().interrupt();
-                mesg("Thread interrupted while checking for start of Activation System. Giving up check.");
-                mesg("Activation System state unknown");
+                mesg("Starting rmid interrupted, giving up at " +
+                    (System.currentTimeMillis() - startTime) + "ms.");
                 return;
             }
-            waitTime -= rmidStartSleepTime;
 
-            // Checking if rmid is present
-            if (ActivationLibrary.rmidRunning(port)) {
-                /**
+            try {
+                int status = vm.exitValue();
+                TestLibrary.bomb("Rmid process exited with status " + status + " after " +
+                    (System.currentTimeMillis() - startTime) + "ms.");
+            } catch (IllegalThreadStateException ignore) { }
+
+            // The rmid process is alive; check to see whether
+            // it responds to a remote call.
+
+            if (lookupSystem(port) != null) {
+                /*
                  * We need to set the java.rmi.activation.port value as the
                  * activation system will use the property to determine the
                  * port #.  The activation system will use this value if set.
@@ -247,17 +287,24 @@
                  * incorrect value.
                  */
                 System.setProperty("java.rmi.activation.port", Integer.toString(port));
-                mesg("finished starting rmid.");
+                mesg("Started successfully after " +
+                    (System.currentTimeMillis() - startTime) + "ms.");
                 return;
             }
-            else {
-                mesg("rmid still not started");
-            }
 
-        } while (waitTime > 0);
-        TestLibrary.bomb("start rmid failed... giving up", null);
+            if (System.currentTimeMillis() > deadline) {
+                TestLibrary.bomb("Failed to start rmid, giving up after " +
+                    (System.currentTimeMillis() - startTime) + "ms.", null);
+            }
+        }
     }
 
+    /**
+     * Destroys rmid and restarts it. Note that this does NOT clean up
+     * the log file, because it stores information about restartable
+     * and activatable objects that must be carried over to the new
+     * rmid instance.
+     */
     public void restart() throws IOException {
         destroy();
         start();
@@ -266,41 +313,39 @@
     /**
      * Ask rmid to shutdown gracefully using a remote method call.
      * catch any errors that might occur from rmid not being present
-     * at time of shutdown invocation.
-     *
-     * Shutdown does not nullify possible references to the rmid
-     * process object (destroy does though).
+     * at time of shutdown invocation. If the remote call is
+     * successful, wait for the process to terminate. Return true
+     * if the process terminated, otherwise return false.
      */
-    public static void shutdown(int port) {
+    private boolean shutdown() throws InterruptedException {
+        mesg("shutdown()");
+        long startTime = System.currentTimeMillis();
+        ActivationSystem system = lookupSystem(port);
+        if (system == null) {
+            mesg("lookupSystem() returned null after " +
+                (System.currentTimeMillis() - startTime) + "ms.");
+            return false;
+        }
 
         try {
-            ActivationSystem system = null;
-
-            try {
-                mesg("getting a reference to the activation system");
-                system = (ActivationSystem) Naming.lookup("//:" +
-                    port +
-                    "/java.rmi.activation.ActivationSystem");
-                mesg("obtained a reference to the activation system");
-            } catch (RemoteException re) {
-                mesg("could not contact registry while trying to shutdown activation system");
-            } catch (java.net.MalformedURLException mue) {
-            }
-
-            if (system == null) {
-                TestLibrary.bomb("reference to the activation system was null");
-            }
+            mesg("ActivationSystem.shutdown()");
             system.shutdown();
-
-        } catch (RemoteException re) {
-            mesg("shutting down the activation daemon failed");
         } catch (Exception e) {
-            mesg("caught exception trying to shutdown rmid");
-            mesg(e.getMessage());
+            mesg("Caught exception from ActivationSystem.shutdown():");
             e.printStackTrace();
         }
 
-        mesg("testlibrary finished shutting down rmid");
+        try {
+            waitFor(TIMEOUT_SHUTDOWN_MS);
+            mesg("Shutdown successful after " +
+                (System.currentTimeMillis() - startTime) + "ms.");
+            return true;
+        } catch (TimeoutException ex) {
+            mesg("Shutdown timed out after " +
+                (System.currentTimeMillis() - startTime) + "ms:");
+            ex.printStackTrace();
+            return false;
+        }
     }
 
     /**
@@ -309,60 +354,51 @@
      * if rmid is a child process of the current VM.
      */
     public void destroy() {
-        // attempt graceful shutdown of the activation system
-        shutdown(port);
+        if (vm == null) {
+            throw new IllegalStateException("can't wait for RMID that isn't running");
+        }
 
-        if (vm != null) {
-            try {
-                /* Waiting for distant RMID process to shutdown.
-                 * Waiting is bounded at a hardcoded max of 60 secs (1 min).
-                 * Waiting by steps of 200 msecs, thus at most 300 such attempts
-                 * for termination of distant RMID process. If process is not
-                 * known to be terminated properly after that time,
-                 * we give up for a gracefull termination, and thus go for
-                 * forcibly destroying the process.
-                 */
-                boolean vmEnded = false;
-                int waitingTrials = 0;
-                final int maxTrials = 300;
-                final long vmProcessEndWaitInterval = 200;
-                int vmExitValue;
-                do {
-                    try {
-                        Thread.sleep(vmProcessEndWaitInterval);
-                        waitingTrials++;
-                        vmExitValue = vm.exitValue();
-                        mesg("rmid exited on shutdown request");
-                        vmEnded = true;
-                    } catch (IllegalThreadStateException illegal) {
-                        mesg("RMID's process still not terminated after more than " +
-                             (waitingTrials * vmProcessEndWaitInterval) + " milliseconds");
-                    }
-                }
-                while (!vmEnded &&
-                       (waitingTrials < maxTrials));
+        long startTime = System.currentTimeMillis();
 
-                if (waitingTrials >= maxTrials) {
-                    mesg("RMID's process still not terminated after more than " +
-                         (waitingTrials * vmProcessEndWaitInterval) + " milliseconds." +
-                         "Givinp up gracefull termination...");
-                    mesg("destroying RMID's process using Process.destroy()");
-                    super.destroy();
+        // First, attempt graceful shutdown of the activation system.
+        try {
+            if (! shutdown()) {
+                // Graceful shutdown failed, use Process.destroy().
+                mesg("Destroying RMID process.");
+                vm.destroy();
+                try {
+                    waitFor(TIMEOUT_DESTROY_MS);
+                    mesg("Destroy successful after " +
+                        (System.currentTimeMillis() - startTime) + "ms.");
+                } catch (TimeoutException ex) {
+                    mesg("Destroy timed out, giving up after " +
+                        (System.currentTimeMillis() - startTime) + "ms:");
+                    ex.printStackTrace();
                 }
-
-            } catch (InterruptedException ie) {
-                Thread.currentThread().interrupt();
-                mesg("Thread interrupted while checking for termination of distant rmid vm. Giving up check.");
-            } catch (Exception e) {
-                mesg("caught unexpected exception trying to destroy rmid: " +
-                     e.getMessage());
-                e.printStackTrace();
             }
-
-            // rmid will not restart if its process is not null
-            vm = null;
+        } catch (InterruptedException ie) {
+            mesg("Shutdown/destroy interrupted, giving up at " +
+                (System.currentTimeMillis() - startTime) + "ms.");
+            ie.printStackTrace();
+            Thread.currentThread().interrupt();
+            return;
         }
+
+        vm = null;
     }
 
-    public int getPort() {return port;}
+    /**
+     * Shuts down rmid and then removes its log file.
+     */
+    public void cleanup() {
+        destroy();
+        RMID.removeLog();
+    }
+
+    /**
+     * Gets the port on which this rmid is listening.
+     */
+    public int getPort() {
+        return port;
+    }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/TestLibrary.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/TestLibrary.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/TestLibrary.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/TestLibrary.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -154,15 +154,19 @@
         return false;
     }
 
-    public static String getProperty(String property, String defaultVal) {
-        final String prop = property;
-        final String def = defaultVal;
-        return java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty(prop, def);
-                }
-            });
+    public static String getProperty(final String property,
+                                     final String defaultVal) {
+        try {
+            return java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<String>() {
+                    public String run() {
+                        return System.getProperty(property, defaultVal);
+                    }
+                });
+        } catch (Exception ex) {
+            bomb("Exception getting property " + property, ex);
+            throw new AssertionError("this should be unreachable");
+        }
     }
 
     /**
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/TestParams.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/TestParams.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/testlibrary/TestParams.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/testlibrary/TestParams.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -32,55 +32,49 @@
 public class TestParams {
 
     /** variables that hold value property values */
-    public static String testSrc = null;
-    public static String testClasses = null;
+    public static final String testSrc;
+    public static final String testClasses;
 
-    /** name of default security policy */
-    public static String defaultPolicy = null;
+    /** name of default security policy for test JVM */
+    public static final String defaultPolicy;
 
     /** name of default security policy for RMID */
-    public static String defaultRmidPolicy = null;
+    public static final String defaultRmidPolicy;
 
     /** name of default security policy for activation groups */
-    public static String defaultGroupPolicy = null;
+    public static final String defaultGroupPolicy;
 
     /** name of default security manager */
-    public static String defaultSecurityManager =
-        "java.rmi.RMISecurityManager";
+    public static final String defaultSecurityManager;
 
+    /** VM options string */
+    public static final String testVmOpts;
+
+    /** Java options string */
+    public static final String testJavaOpts;
 
     /* Initalize commonly used strings */
     static {
-        try {
-            testSrc = TestLibrary.
-                getProperty("test.src", ".");
-            testClasses = TestLibrary.
-                getProperty("test.classes", ".");
-
-            // if policy file already set use it
-            defaultPolicy = TestLibrary.
-                getProperty("java.security.policy",
-                            defaultPolicy);
-            if (defaultPolicy == null) {
-                defaultPolicy = testSrc + File.separatorChar +
-                    "security.policy";
-            }
-
-            // if manager prop set use it
-            defaultSecurityManager = TestLibrary.
-                getProperty("java.security.manager",
-                            defaultSecurityManager);
-
-            defaultRmidPolicy =
-                testSrc + File.separatorChar + "rmid.security.policy";
-
-            defaultGroupPolicy = testSrc +
-                File.separatorChar + "group.security.policy";
-
-        } catch (SecurityException se) {
-            TestLibrary.bomb("Security exception received" +
-                             " during test initialization:",
-                             se);
+        testSrc = TestLibrary.getProperty("test.src", ".");
+        testClasses = TestLibrary.getProperty("test.classes", ".");
+
+        String dp = TestLibrary.getProperty("java.security.policy", null);
+        if (dp == null) {
+            dp = testSrc + File.separatorChar + "security.policy";
         }
+        defaultPolicy = dp;
+
+        defaultRmidPolicy =
+            testSrc + File.separatorChar + "rmid.security.policy";
+
+        defaultGroupPolicy =
+            testSrc + File.separatorChar + "group.security.policy";
+
+        defaultSecurityManager = TestLibrary.getProperty(
+            "java.security.manager", "java.lang.SecurityManager");
+
+        testVmOpts = TestLibrary.getProperty("test.vm.opts", "");
+
+        testJavaOpts = TestLibrary.getProperty("test.java.opts", "");
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/transport/checkLeaseInfoLeak/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/transport/checkLeaseInfoLeak/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/transport/checkLeaseInfoLeak/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/transport/checkLeaseInfoLeak/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -14,8 +14,7 @@
   permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/transport/dgcDeadLock/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/transport/dgcDeadLock/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/rmi/transport/dgcDeadLock/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/rmi/transport/dgcDeadLock/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -19,8 +19,7 @@
   permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
 
   // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.classes", "read";
-  permission java.util.PropertyPermission "test.src", "read";
+  permission java.util.PropertyPermission "test.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/security/Policy/SignedJar/java.security openjdk-8-8u312-b07/=unpacked-tar3=/test/java/security/Policy/SignedJar/java.security
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/security/Policy/SignedJar/java.security	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/security/Policy/SignedJar/java.security	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,3 @@
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
+      DSA keySize < 1024, include jdk.disabled.namedCurves, \
+      SHA1 jdkCA & denyAfter 2019-01-01
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/security/Policy/SignedJar/SignedJarTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/security/Policy/SignedJar/SignedJarTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/security/Policy/SignedJar/SignedJarTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/security/Policy/SignedJar/SignedJarTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, 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
@@ -32,7 +32,7 @@
 
 /**
  * @test
- * @bug 8048360
+ * @bug 8048360 8242565
  * @summary test policy entry with signedBy alias
  * @library /lib/testlibrary
  * @run main/othervm SignedJarTest
@@ -52,6 +52,7 @@
     private static final String POLICY2 = "SignedJarTest_2.policy";
     private static final String KEYSTORE1 = "both.jks";
     private static final String KEYSTORE2 = "first.jks";
+    private static final String SECPROPS = TESTSRC + FS + "java.security";
 
     public static void main(String args[]) throws Throwable {
         //copy PrivilegeTest.class, policy files and keystore password file into current direcotry
@@ -147,6 +148,7 @@
             "-classpath", classpath,
             "-Djava.security.manager",
             "-Djava.security.policy=" + policy,
+            "-Djava.security.properties=" + SECPROPS,
             "PrivilegeTest",
             arg1, arg2};
         return cmd;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Arrays/TimSortStackSize2.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Arrays/TimSortStackSize2.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Arrays/TimSortStackSize2.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Arrays/TimSortStackSize2.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,22 +24,64 @@
 /*
  * @test
  * @bug 8072909
- * @run main/othervm -Xms385m TimSortStackSize2 67108864
  * @summary Test TimSort stack size on big arrays
- * big tests not for regular execution on all platforms:
- * run main/othervm -Xmx8g TimSortStackSize2 1073741824
- * run main/othervm -Xmx16g TimSortStackSize2 2147483644
+ * @key intermittent
+ * @library /lib/testlibrary /lib
+ * @build jdk.testlibrary.*
+ * @build TimSortStackSize2
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *     -XX:+WhiteBoxAPI TimSortStackSize2
  */
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+import sun.hotspot.WhiteBox;
+
 public class TimSortStackSize2 {
 
     public static void main(String[] args) {
-        int lengthOfTest = Integer.parseInt(args[0]);
+        if ( args == null || args.length == 0 ){
+            startMeWithArgs();
+        } else {
+            doTestOfTwoTimSorts(Integer.parseInt(args[0]));
+        }
+    }
+
+    private static void startMeWithArgs(){
+        /*
+         * big tests not for regular execution on all platforms:
+         * run main/othervm -Xmx8g TimSortStackSize2 1073741824
+         * run main/othervm -Xmx16g TimSortStackSize2 2147483644
+         */
+        try {
+            Boolean compressedOops = WhiteBox.getWhiteBox()
+                                             .getBooleanVMFlag("UseCompressedOops");
+            long memory = (compressedOops == null || compressedOops) ? 385 : 770;
+            final String xmsValue = "-Xms" +     memory + "m";
+            final String xmxValue = "-Xmx" + 2 * memory + "m";
+
+            System.out.printf("compressedOops: %s; Test will be started with \"%s %s\"%n",
+                              compressedOops, xmsValue, xmxValue);
+            OutputAnalyzer output = ProcessTools.executeTestJvm(xmsValue,
+                                                                xmxValue,
+                                                                "TimSortStackSize2",
+                                                                "67108864");
+            System.out.println(output.getOutput());
+            output.shouldHaveExitValue(0);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void doTestOfTwoTimSorts(final int lengthOfTest){
         boolean passed = doTest("TimSort", lengthOfTest,
             (Integer [] a) -> Arrays.sort(a));
         passed = doTest("ComparableTimSort", lengthOfTest, (Integer [] a) ->
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Locale/LocaleEnhanceTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Locale/LocaleEnhanceTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Locale/LocaleEnhanceTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Locale/LocaleEnhanceTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, 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
@@ -43,7 +43,8 @@
 
 /**
  * @test
- * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019
+ * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603
+ *    7044019 8255086
  * @summary test API changes to Locale
  * @compile LocaleEnhanceTest.java
  * @run main/othervm -esa LocaleEnhanceTest
@@ -612,7 +613,7 @@
 
         Locale.setDefault(Locale.US);
         assertEquals("latn US", "Latin", latnLocale.getDisplayScript());
-        assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript());
+        assertEquals("hans US", "Simplified", hansLocale.getDisplayScript());
 
         Locale.setDefault(Locale.GERMANY);
         assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript());
@@ -626,7 +627,7 @@
         Locale hansLocale = Locale.forLanguageTag("und-hans");
 
         assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US));
-        assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US));
+        assertEquals("hans US", "Simplified", hansLocale.getDisplayScript(Locale.US));
 
         assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY));
         assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY));
@@ -653,10 +654,10 @@
                 "United States",
                 "Norwegian (Norway,Nynorsk)",
                 "Nynorsk",
-                "Chinese (Simplified Han)",
-                "Chinese (Traditional Han)",
-                "Chinese (Simplified Han,China)",
-                "Simplified Han",
+                "Chinese (Simplified)",
+                "Chinese (Traditional)",
+                "Chinese (Simplified,China)",
+                "Simplified",
         };
 
         final String[] displayNameSimplifiedChinese = {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Locale/LocaleTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Locale/LocaleTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/Locale/LocaleTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/Locale/LocaleTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, 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
@@ -25,7 +25,7 @@
  * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
  * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
  * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
- * 6786276 7066203 7085757
+ * 6786276 7066203 7085757 8255086
  * @summary test Locales
  */
 /*
@@ -576,7 +576,7 @@
         // names, and other stuff like that.  This test just checks specific language
         // and country codes to make sure we have the correct names for them.
         String[] languageCodes = { "he", "id", "iu", "ug", "yi", "za" };
-        String[] languageNames = { "Hebrew", "Indonesian", "Inuktitut", "Uighur", "Yiddish",
+        String[] languageNames = {"Hebrew", "Indonesian", "Inuktitut", "Uyghur", "Yiddish",
                                    "Zhuang" };
 
         for (int i = 0; i < languageCodes.length; i++) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/logging/FileHandlerAccessTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/logging/FileHandlerAccessTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/logging/FileHandlerAccessTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/logging/FileHandlerAccessTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+/**
+ * @test
+ * @bug 8252883
+ * @summary tests the handling of AccessDeniedException due to delay in Windows deletion.
+ * @modules java.logging/java.util.logging:open
+ * @run main/othervm FileHandlerAccessTest 20
+ * @author evwhelan
+ */
+
+public class FileHandlerAccessTest {
+    public static void main(String[] args) {
+        int count = Integer.parseInt(args[0]);
+        System.out.println("Testing with " + count + " threads");
+        for (int i = 0; i < count; i++) {
+            new Thread(FileHandlerAccessTest::access).start();
+        }
+    }
+
+    private static void access() {
+        try {
+            FileHandler handler = new FileHandler("sample%g.log", 1048576, 2, true);
+            handler.publish(new LogRecord(Level.SEVERE, "TEST"));
+            handler.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/logging/ParentLoggersTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/logging/ParentLoggersTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/java/util/logging/ParentLoggersTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/java/util/logging/ParentLoggersTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -29,7 +29,7 @@
  * @author  ss45998
  *
  * @build ParentLoggersTest
- * @run main ParentLoggersTest
+ * @run main/othervm ParentLoggersTest
  */
 
 /*
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/accessibility/6192422/bug6192422.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/accessibility/6192422/bug6192422.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/accessibility/6192422/bug6192422.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/accessibility/6192422/bug6192422.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2005, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 6192422 7106851
+ * @key headful
+ * @summary Verifies fix for JMenuBar not being in the accessibility hierarchy
+ */
+public class bug6192422 {
+
+    private static boolean foundJMenuBar = false;
+
+    public static void main(String[] args) throws Throwable {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                if (!testIt()) {
+                    throw new RuntimeException("JMenuBar was not found");
+                }
+            }
+        });
+    }
+
+    /*
+     * Test whether JMenuBar is in accessibility hierarchy
+     */
+    private static boolean testIt() {
+
+        JFrame frame = new JFrame("bug6192422");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        /*
+         * Add a menu bar to the frame using setJMenuBar. The setJMenuBar
+         * method add the menu bar to the JLayeredPane.
+         */
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.add(new JMenu("foo"));
+        menuBar.add(new JMenu("bar"));
+        menuBar.add(new JMenu("baz"));
+        frame.setJMenuBar(menuBar);
+
+        findJMenuBar(frame.getAccessibleContext());
+        return foundJMenuBar;
+    }
+
+    /*
+     * Finds the JMenuBar in the Accessibility hierarchy
+     */
+    private static void findJMenuBar(AccessibleContext ac) {
+        if (ac != null) {
+            System.err.println("findJMenuBar: ac = "+ac.getClass());
+            int num = ac.getAccessibleChildrenCount();
+            System.err.println("  #children "+num);
+
+            for (int i = 0; i < num; i++) {
+                System.err.println("  child #"+i);
+                Accessible a = ac.getAccessibleChild(i);
+                AccessibleContext child = a.getAccessibleContext();
+                AccessibleRole role = child.getAccessibleRole();
+                System.err.println("  role "+role);
+                if (role == AccessibleRole.MENU_BAR) {
+                    foundJMenuBar = true;
+                    return;
+                }
+                if (child.getAccessibleChildrenCount() > 0) {
+                    findJMenuBar(child);
+                }
+            }
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/imageio/plugins/png/ITXtTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/imageio/plugins/png/ITXtTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/imageio/plugins/png/ITXtTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/imageio/plugins/png/ITXtTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -21,16 +21,15 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug     6541476
- * @summary Test verifies that ImageIO PNG plugin correcly handles the
+ * @bug     6541476 7059970
+ * @summary Test verifies that ImageIO PNG plug-in correctly handles the
  *          iTxt chunk (International textual data).
  *
  * @run     main ITXtTest
  */
 
-
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -157,21 +156,22 @@
 
         File file = new File("test.png");
 
-        writeTo(file, src);
-        ITXtTest dst = readFrom(file);
-
-        if (dst == null || !dst.equals(src)) {
-            throw new RuntimeException("Test failed.");
+        try {
+            writeTo(file, src);
+            ITXtTest dst = readFrom(file);
+            if (dst == null || !dst.equals(src)) {
+                throw new RuntimeException("Test failed.");
+            }
+        } finally {
+            file.delete();
         }
-
         System.out.println("Test passed.");
     }
 
     private static void writeTo(File f, ITXtTest t) {
         BufferedImage src = createBufferedImage();
-        try {
-            ImageOutputStream imageOutputStream =
-                ImageIO.createImageOutputStream(f);
+        try (ImageOutputStream imageOutputStream =
+                ImageIO.createImageOutputStream(f)) {
 
             ImageTypeSpecifier imageTypeSpecifier =
                 new ImageTypeSpecifier(src);
@@ -191,7 +191,6 @@
             m.setFromTree(format, root);
 
             imageWriter.write(new IIOImage(src, null, m));
-            imageOutputStream.close();
             System.out.println("Writing done.");
         } catch (Throwable e) {
             throw new RuntimeException("Writing test failed.", e);
@@ -199,10 +198,11 @@
     }
 
     private static ITXtTest readFrom(File f) {
-        try {
-            ImageInputStream iis = ImageIO.createImageInputStream(f);
-            ImageReader r = ImageIO.getImageReaders(iis).next();
-            r.setInput(iis);
+        try (ImageInputStream imageInputStream =
+                ImageIO.createImageInputStream(f)) {
+
+            ImageReader r = ImageIO.getImageReaders(imageInputStream).next();
+            r.setInput(imageInputStream);
 
             IIOImage dst = r.readAll(0, null);
 
@@ -234,3 +234,4 @@
         return image;
     }
 }
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/imageio/plugins/png/PngLargeIHDRDimensionTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/imageio/plugins/png/PngLargeIHDRDimensionTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/imageio/plugins/png/PngLargeIHDRDimensionTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/imageio/plugins/png/PngLargeIHDRDimensionTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug     8190332
+ * @summary Test verifies whether PNGImageReader throws IIOException
+ *          or not when IHDR width value is very high.
+ * @run     main PngLargeIHDRDimensionTest
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Base64;
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
+
+public class PngLargeIHDRDimensionTest {
+
+    /*
+     * IHDR width is very large and when we try to create buffer to store
+     * image information of each row it overflows and we get
+     * NegativeArraySizeException without the fix for this bug.
+     */
+    private static String negativeArraySizeExceptionInput = "iVBORw0KGgoAAAANS"
+            + "UhEUg////0AAAABEAIAAAA6fptVAAAACklEQVQYV2P4DwABAQEAWk1v8QAAAAB"
+            + "JRU5ErkJgggo=";
+
+    /*
+     * IHDR width is ((2 to the power of 31) - 2), which is the maximum VM
+     * limit to create an array we get OutOfMemoryError without the fix
+     * for this bug.
+     */
+    private static String outOfMemoryErrorInput = "iVBORw0KGgoAAAANSUhEUgAAAAF/"
+            + "///+CAAAAAA6fptVAAAACklEQVQYV2P4DwABAQEAWk1v8QAAAABJRU5"
+            + "ErkJgggo=";
+
+    private static InputStream input;
+    private static Boolean firstTestFailed = true, secondTestFailed = true;
+    public static void main(String[] args) throws java.io.IOException {
+        byte[] inputBytes = Base64.getDecoder().
+                decode(negativeArraySizeExceptionInput);
+        input = new ByteArrayInputStream(inputBytes);
+
+        try {
+            ImageIO.read(input);
+        } catch (IIOException e) {
+            firstTestFailed = false;
+        }
+
+        inputBytes = Base64.getDecoder().decode(outOfMemoryErrorInput);
+        input = new ByteArrayInputStream(inputBytes);
+
+        try {
+            ImageIO.read(input);
+        } catch (IIOException e) {
+            secondTestFailed = false;
+        }
+
+        if (firstTestFailed || secondTestFailed) {
+            throw new RuntimeException("Test doesn't throw required"
+                    + " IIOException");
+        }
+    }
+}
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java	2021-09-01 14:33:15.000000000 +0000
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4750141 4895631 8217579
+ * @bug 4750141 4895631 8217579 8163326
  * @summary Check enabled and supported ciphersuites are correct
  * @run main/othervm -Djdk.tls.client.protocols="TLSv1.3,TLSv1.2,TLSv1.1,TLSv1,SSLv3" CheckCipherSuites default
  * @run main/othervm -Djdk.tls.client.protocols="TLSv1.3,TLSv1.2,TLSv1.1,TLSv1,SSLv3" CheckCipherSuites limited
@@ -38,50 +38,91 @@
     // List of enabled cipher suites when the "crypto.policy" security
     // property is set to "unlimited" (the default value).
     private final static String[] ENABLED_DEFAULT = {
-        "TLS_AES_128_GCM_SHA256",
+        // TLS 1.3 cipher suites
         "TLS_AES_256_GCM_SHA384",
+        "TLS_AES_128_GCM_SHA256",
+
+        // Suite B compliant cipher suites
         "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
         "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(GCM) - ECDHE - forward screcy
         "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+
+        // AES_128(GCM) - ECDHE - forward screcy
+        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(GCM) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
         "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_128(GCM) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(CBC) - ECDHE - forward screcy
         "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
         "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
+
+        // AES_256(CBC) - ECDHE - forward screcy
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(CBC) - DHE - forward screcy
+        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
+        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
+
+        // AES_128(CBC) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(GCM) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+
+        // AES_128(GCM) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(CBC) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
+        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
+
+        // AES_128(CBC) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(CBC) - ECDHE - using SHA
+        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - ECDHE - using SHA
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+
+        // AES_256(CBC) - DHE - using SHA
+        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
+        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - DHE - using SHA
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+
+        // AES_256(CBC) - using SHA, not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - using SHA, not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+
+        // deprecated
+        "TLS_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_RSA_WITH_AES_256_CBC_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA256",
+        "TLS_RSA_WITH_AES_256_CBC_SHA",
+        "TLS_RSA_WITH_AES_128_CBC_SHA",
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
     };
 
@@ -91,75 +132,116 @@
         "TLS_AES_128_GCM_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA",
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
     };
 
     // List of supported cipher suites when the "crypto.policy" security
     // property is set to "unlimited" (the default value).
     private final static String[] SUPPORTED_DEFAULT = {
-        "TLS_AES_128_GCM_SHA256",
+         // TLS 1.3 cipher suites
         "TLS_AES_256_GCM_SHA384",
+        "TLS_AES_128_GCM_SHA256",
+
+        // Suite B compliant cipher suites
         "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
         "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(GCM) - ECDHE - forward screcy
         "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+
+        // AES_128(GCM) - ECDHE - forward screcy
+        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(GCM) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
         "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_128(GCM) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(CBC) - ECDHE - forward screcy
         "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
         "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
+
+        // AES_256(CBC) - ECDHE - forward screcy
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(CBC) - DHE - forward screcy
+        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
+        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
+
+        // AES_128(CBC) - DHE - forward screcy
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(GCM) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+
+        // AES_128(GCM) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+
+        // AES_256(CBC) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
+        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
+
+        // AES_128(CBC) - not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
+
+        // AES_256(CBC) - ECDHE - using SHA
+        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - ECDHE - using SHA
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+
+        // AES_256(CBC) - DHE - using SHA
+        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
+        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - DHE - using SHA
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+
+        // AES_256(CBC) - using SHA, not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
+
+        // AES_128(CBC) - using SHA, not forward screcy
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+
+        // deprecated
+        "TLS_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_RSA_WITH_AES_256_CBC_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA256",
+        "TLS_RSA_WITH_AES_256_CBC_SHA",
+        "TLS_RSA_WITH_AES_128_CBC_SHA",
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
     };
 
@@ -169,25 +251,25 @@
         "TLS_AES_128_GCM_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
         "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
         "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA256",
+        "TLS_RSA_WITH_AES_128_CBC_SHA",
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
     };
 
@@ -220,7 +302,8 @@
             throw new Exception("Illegal argument");
         }
 
-        SSLSocketFactory factory = (SSLSocketFactory)SSLSocketFactory.getDefault();
+        SSLSocketFactory factory =
+                (SSLSocketFactory)SSLSocketFactory.getDefault();
         SSLSocket socket = (SSLSocket)factory.createSocket();
         String[] enabled = socket.getEnabledCipherSuites();
 
@@ -249,5 +332,4 @@
         long end = System.currentTimeMillis();
         System.out.println("Done (" + (end - start) + " ms).");
     }
-
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java	2021-09-01 14:33:15.000000000 +0000
@@ -41,115 +41,159 @@
     // Supported ciphersuites
     private final static List<String> supportedCipherSuites
             = Arrays.<String>asList(
-        "TLS_AES_128_GCM_SHA256",
-        "TLS_AES_256_GCM_SHA384",
-        "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
-
-        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
-        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-        "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
-        "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
-        "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
-        "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
-
-        "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
-        "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-        "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
-        "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
-        "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-        "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
-
-        "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
-
-        "TLS_DH_anon_WITH_AES_256_GCM_SHA384",
-        "TLS_DH_anon_WITH_AES_128_GCM_SHA256",
-
-        "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
-        "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
-        "TLS_DH_anon_WITH_AES_256_CBC_SHA",
-        "TLS_DH_anon_WITH_AES_128_CBC_SHA256",
-        "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
-        "TLS_DH_anon_WITH_AES_128_CBC_SHA",
-        "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
-        "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
-
-        "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
-        "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
-        "SSL_RSA_WITH_RC4_128_SHA",
-        "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
-        "TLS_ECDH_RSA_WITH_RC4_128_SHA",
-        "SSL_RSA_WITH_RC4_128_MD5",
-        "TLS_ECDH_anon_WITH_RC4_128_SHA",
-        "SSL_DH_anon_WITH_RC4_128_MD5",
-
-        "SSL_RSA_WITH_DES_CBC_SHA",
-        "SSL_DHE_RSA_WITH_DES_CBC_SHA",
-        "SSL_DHE_DSS_WITH_DES_CBC_SHA",
-        "SSL_DH_anon_WITH_DES_CBC_SHA",
-        "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
-        "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
-        "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
-        "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
-
-        "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
-        "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
-
-        "TLS_RSA_WITH_NULL_SHA256",
-        "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
-        "TLS_ECDHE_RSA_WITH_NULL_SHA",
-        "SSL_RSA_WITH_NULL_SHA",
-        "TLS_ECDH_ECDSA_WITH_NULL_SHA",
-        "TLS_ECDH_RSA_WITH_NULL_SHA",
-        "TLS_ECDH_anon_WITH_NULL_SHA",
-        "SSL_RSA_WITH_NULL_MD5",
-
-        "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
-        "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
-        "TLS_KRB5_WITH_RC4_128_SHA",
-        "TLS_KRB5_WITH_RC4_128_MD5",
-        "TLS_KRB5_WITH_DES_CBC_SHA",
-        "TLS_KRB5_WITH_DES_CBC_MD5",
-        "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
-        "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
-        "TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
-        "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
-    );
+                    // TLS 1.3 cipher suites.
+                    "TLS_AES_256_GCM_SHA384",
+                    "TLS_AES_128_GCM_SHA256",
+                    // Suite B compliant cipher suites, see RFC 6460.
+                    "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+                    "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+                    //
+                    // Forward secrecy cipher suites.
+                    //
+                    // AES_256(GCM) - ECDHE
+                    "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+                    // AES_128(GCM) - ECDHE
+                    "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+                    // AES_256(GCM) - DHE
+                    "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+                    "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
+                    // AES_128(GCM) - DHE
+                    "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+                    "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
+                    // AES_256(CBC) - ECDHE
+                    "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
+                    "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
+                    // AES_128(CBC) - ECDHE
+                    "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
+                    "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
+                    // AES_256(CBC) - DHE
+                    "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
+                    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
+                    // AES_128(CBC) - DHE
+                    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
+                    "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
+                    //
+                    // Not forward secret cipher suites.
+                    //
+                    // AES_256(GCM)
+                    "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
+                    "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+                    // AES_128(GCM)
+                    "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+                    "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+                    // AES_256(CBC)
+                    "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
+                    "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
+                    // AES_128(CBC)
+                    "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
+                    "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
+                    //
+                    // Legacy, used for compatibility
+                    //
+                    // AES_256(CBC) - ECDHE - Using SHA
+                    "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+                    "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+                    // AES_128(CBC) - ECDHE - using SHA
+                    "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
+                    "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+                    // AES_256(CBC) - DHE - Using SHA
+                    "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
+                    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
+                    // AES_128(CBC) - DHE - using SHA
+                    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
+                    "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+                    // AES_256(CBC) - using SHA, not forward secrecy
+                    "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
+                    "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
+                    // AES_128(CBC) - using SHA, not forward secrecy
+                    "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+                    "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+                    //
+                    // Deprecated, used for compatibility
+                    //
+                    // RSA, AES_256(GCM)
+                    "TLS_RSA_WITH_AES_256_GCM_SHA384",
+                    // RSA, AES_128(GCM)
+                    "TLS_RSA_WITH_AES_128_GCM_SHA256",
+                    // RSA, AES_256(CBC)
+                    "TLS_RSA_WITH_AES_256_CBC_SHA256",
+                    // RSA, AES_128(CBC)
+                    "TLS_RSA_WITH_AES_128_CBC_SHA256",
+                    // RSA, AES_256(CBC) - using SHA, not forward secrecy
+                    "TLS_RSA_WITH_AES_256_CBC_SHA",
+                    // RSA, AES_128(CBC) - using SHA, not forward secrecy
+                    "TLS_RSA_WITH_AES_128_CBC_SHA",
+                    // 3DES_EDE, forward secrecy.
+                    "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+                    "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+                    "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+                    "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+                    // 3DES_EDE, not forward secrecy.
+                    "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
+                    "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
+                    "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
+                    // Renegotiation protection request Signalling
+                    // Cipher Suite Value (SCSV).
+                    "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
+                    // Definition of the Cipher Suites that are supported but not
+                    // enabled by default.
+                    "TLS_DH_anon_WITH_AES_256_GCM_SHA384",
+                    "TLS_DH_anon_WITH_AES_128_GCM_SHA256",
+                    "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
+                    "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
+                    "TLS_DH_anon_WITH_AES_256_CBC_SHA",
+                    "TLS_DH_anon_WITH_AES_128_CBC_SHA256",
+                    "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
+                    "TLS_DH_anon_WITH_AES_128_CBC_SHA",
+                    "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+                    "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+                    // RC4
+                    "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+                    "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+                    "SSL_RSA_WITH_RC4_128_SHA",
+                    "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+                    "TLS_ECDH_RSA_WITH_RC4_128_SHA",
+                    "SSL_RSA_WITH_RC4_128_MD5",
+                    "TLS_ECDH_anon_WITH_RC4_128_SHA",
+                    "SSL_DH_anon_WITH_RC4_128_MD5",
+                    // Weak cipher suites obsoleted in TLS 1.2 [RFC 5246]
+                    "SSL_RSA_WITH_DES_CBC_SHA",
+                    "SSL_DHE_RSA_WITH_DES_CBC_SHA",
+                    "SSL_DHE_DSS_WITH_DES_CBC_SHA",
+                    "SSL_DH_anon_WITH_DES_CBC_SHA",
+                    // Weak cipher suites obsoleted in TLS 1.1  [RFC 4346]
+                    "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
+                    "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+                    "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+                    "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
+                    "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
+                    "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
+                    // No traffic encryption cipher suites
+                    "TLS_RSA_WITH_NULL_SHA256",
+                    "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
+                    "TLS_ECDHE_RSA_WITH_NULL_SHA",
+                    "SSL_RSA_WITH_NULL_SHA",
+                    "TLS_ECDH_ECDSA_WITH_NULL_SHA",
+                    "TLS_ECDH_RSA_WITH_NULL_SHA",
+                    "TLS_ECDH_anon_WITH_NULL_SHA",
+                    "SSL_RSA_WITH_NULL_MD5",
+
+                    "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
+                    "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
+                    "TLS_KRB5_WITH_RC4_128_SHA",
+                    "TLS_KRB5_WITH_RC4_128_MD5",
+                    "TLS_KRB5_WITH_DES_CBC_SHA",
+                    "TLS_KRB5_WITH_DES_CBC_MD5",
+                    "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
+                    "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
+                    "TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
+                    "TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
+                    // Definition of the cipher suites that are not supported but the names
+                    // are known.
+                    "TLS_CHACHA20_POLY1305_SHA256",
+                    "TLS_AES_128_CCM_SHA256",
+                    "TLS_AES_128_CCM_8_SHA256"
+            );
 
     private final static String[] protocols = {
         "", "SSL", "TLS", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"
@@ -159,7 +203,7 @@
     public static void main(String[] args) throws Exception {
         // show all of the supported cipher suites
         showSuites(supportedCipherSuites.toArray(new String[0]),
-                 "All supported cipher suites");
+                "All supported cipher suites");
 
         for (String protocol : protocols) {
             System.out.println("//");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/templates/SSLContextTemplate.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/templates/SSLContextTemplate.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/net/ssl/templates/SSLContextTemplate.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/net/ssl/templates/SSLContextTemplate.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -34,9 +34,7 @@
 import java.security.cert.CertificateFactory;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.*;
 
 /**
  * SSLContext template to speed up JSSE tests.
@@ -46,10 +44,9 @@
      * Create an instance of SSLContext for client use.
      */
     default SSLContext createClientSSLContext() throws Exception {
-        return createSSLContext(trustedCertStrs,
-                endEntityCertStrs, endEntityPrivateKeys,
-                endEntityPrivateKeyAlgs,
-                endEntityPrivateKeyNames,
+        return createSSLContext(
+                createClientKeyManager(),
+                createClientTrustManager(),
                 getClientContextParameters());
     }
 
@@ -57,14 +54,54 @@
      * Create an instance of SSLContext for server use.
      */
     default SSLContext createServerSSLContext() throws Exception {
-        return createSSLContext(trustedCertStrs,
-                endEntityCertStrs, endEntityPrivateKeys,
+        return createSSLContext(
+                createServerKeyManager(),
+                createServerTrustManager(),
+                getServerContextParameters());
+    }
+
+    /*
+     * Create an instance of KeyManager for client use.
+     */
+    default KeyManager createClientKeyManager() throws Exception {
+        return createKeyManager(
+                endEntityCertStrs,
+                endEntityPrivateKeys,
+                endEntityPrivateKeyAlgs,
+                endEntityPrivateKeyNames,
+                getServerContextParameters());
+    }
+
+    /*
+     * Create an instance of TrustManager for client use.
+     */
+    default TrustManager createClientTrustManager() throws Exception {
+        return createTrustManager(
+                trustedCertStrs,
+                getServerContextParameters());
+    }
+    /*
+     * Create an instance of KeyManager for server use.
+     */
+    default KeyManager createServerKeyManager() throws Exception {
+        return createKeyManager(
+                endEntityCertStrs,
+                endEntityPrivateKeys,
                 endEntityPrivateKeyAlgs,
                 endEntityPrivateKeyNames,
                 getServerContextParameters());
     }
 
     /*
+     * Create an instance of TrustManager for server use.
+     */
+    default TrustManager createServerTrustManager() throws Exception {
+        return createTrustManager(
+                trustedCertStrs,
+                getServerContextParameters());
+    }
+
+    /*
      * The parameters used to configure SSLContext.
      */
     static final class ContextParameters {
@@ -421,80 +458,107 @@
      * Create an instance of SSLContext with the specified trust/key materials.
      */
     default SSLContext createSSLContext(
-            String[] trustedMaterials,
+            KeyManager keyManager,
+            TrustManager trustManager,
+            ContextParameters params) throws Exception {
+
+        SSLContext context = SSLContext.getInstance(params.contextProtocol);
+        context.init(
+                new KeyManager[] {
+                        keyManager
+                    },
+                new TrustManager[] {
+                        trustManager
+                    },
+                null);
+
+        return  context;
+    }
+
+    /*
+     * Create an instance of KeyManager with the specified key materials.
+     */
+    default KeyManager createKeyManager(
             String[] keyMaterialCerts,
             String[] keyMaterialKeys,
             String[] keyMaterialKeyAlgs,
             String[] keyMaterialKeyNames,
             ContextParameters params) throws Exception {
 
-        KeyStore ts = null;     // trust store
-        KeyStore ks = null;     // key store
-        char passphrase[] = "passphrase".toCharArray();
+        char[] passphrase = "passphrase".toCharArray();
 
         // Generate certificate from cert string.
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        // Import the trused certs.
+        // Import the key materials.
+        //
+        // Note that certification paths bigger than one are not supported yet.
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(null, null);
         ByteArrayInputStream is;
-        if (trustedMaterials != null && trustedMaterials.length != 0) {
-            ts = KeyStore.getInstance("JKS");
-            ts.load(null, null);
-
-            Certificate[] trustedCert =
-                    new Certificate[trustedMaterials.length];
-            for (int i = 0; i < trustedMaterials.length; i++) {
-                String trustedCertStr = trustedMaterials[i];
-
-                is = new ByteArrayInputStream(trustedCertStr.getBytes());
-                try {
-                    trustedCert[i] = cf.generateCertificate(is);
-                } finally {
-                    is.close();
-                }
+        for (int i = 0; i < keyMaterialCerts.length; i++) {
+            String keyCertStr = keyMaterialCerts[i];
 
-                ts.setCertificateEntry("trusted-cert-" + i, trustedCert[i]);
+            // generate the private key.
+            PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
+                    Base64.getMimeDecoder().decode(keyMaterialKeys[i]));
+            KeyFactory kf =
+                    KeyFactory.getInstance(keyMaterialKeyAlgs[i]);
+            PrivateKey priKey = kf.generatePrivate(priKeySpec);
+
+            // generate certificate chain
+            is = new ByteArrayInputStream(keyCertStr.getBytes());
+            Certificate keyCert = null;
+            try {
+                keyCert = cf.generateCertificate(is);
+            } finally {
+                is.close();
             }
+
+            Certificate[] chain = new Certificate[] { keyCert };
+
+            // import the key entry.
+            ks.setKeyEntry("cert-" + keyMaterialKeyNames[i],
+                    priKey, passphrase, chain);
         }
 
-        // Import the key materials.
-        //
-        // Note that certification pathes bigger than one are not supported yet.
-        boolean hasKeyMaterials =
-            (keyMaterialCerts != null) && (keyMaterialCerts.length != 0) &&
-            (keyMaterialKeys != null) && (keyMaterialKeys.length != 0) &&
-            (keyMaterialKeyAlgs != null) && (keyMaterialKeyAlgs.length != 0) &&
-            (keyMaterialCerts.length == keyMaterialKeys.length) &&
-            (keyMaterialCerts.length == keyMaterialKeyAlgs.length);
-        if (hasKeyMaterials) {
-            ks = KeyStore.getInstance("JKS");
-            ks.load(null, null);
+        KeyManagerFactory kmf =
+                KeyManagerFactory.getInstance(params.kmAlgorithm);
+        kmf.init(ks, passphrase);
 
-            for (int i = 0; i < keyMaterialCerts.length; i++) {
-                String keyCertStr = keyMaterialCerts[i];
+        KeyManager[] km = kmf.getKeyManagers();
 
-                // generate the private key.
-                PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                    Base64.getMimeDecoder().decode(keyMaterialKeys[i]));
-                KeyFactory kf =
-                    KeyFactory.getInstance(keyMaterialKeyAlgs[i]);
-                PrivateKey priKey = kf.generatePrivate(priKeySpec);
+        return km[0];
+    }
 
-                // generate certificate chain
-                is = new ByteArrayInputStream(keyCertStr.getBytes());
-                Certificate keyCert = null;
-                try {
-                    keyCert = cf.generateCertificate(is);
-                } finally {
-                    is.close();
-                }
-
-                Certificate[] chain = new Certificate[] { keyCert };
-
-                // import the key entry.
-                ks.setKeyEntry("cert-" + keyMaterialKeyNames[i],
-                        priKey, passphrase, chain);
+    /*
+     * Create an instance of TrustManager with the specified trust materials.
+     */
+    default TrustManager createTrustManager(
+            String[] trustedMaterials,
+            ContextParameters params) throws Exception {
+
+        // Generate certificate from cert string.
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+        // Import the trusted certs.
+        KeyStore ts = KeyStore.getInstance("PKCS12");
+        ts.load(null, null);
+
+        Certificate[] trustedCert =
+                new Certificate[trustedMaterials.length];
+        ByteArrayInputStream is;
+        for (int i = 0; i < trustedMaterials.length; i++) {
+            String trustedCertStr = trustedMaterials[i];
+
+            is = new ByteArrayInputStream(trustedCertStr.getBytes());
+            try {
+                trustedCert[i] = cf.generateCertificate(is);
+            } finally {
+                is.close();
             }
+
+            ts.setCertificateEntry("trusted-cert-" + i, trustedCert[i]);
         }
 
         // Create an SSLContext object.
@@ -502,17 +566,7 @@
                 TrustManagerFactory.getInstance(params.tmAlgorithm);
         tmf.init(ts);
 
-        SSLContext context = SSLContext.getInstance(params.contextProtocol);
-        if (hasKeyMaterials && ks != null) {
-            KeyManagerFactory kmf =
-                    KeyManagerFactory.getInstance(params.kmAlgorithm);
-            kmf.init(ks, passphrase);
-
-            context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            context.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return context;
+        TrustManager[] tms = tmf.getTrustManagers();
+        return tms[0];
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/sound/midi/SysexMessage/SendRawSysexMessage.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/sound/midi/SysexMessage/SendRawSysexMessage.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/sound/midi/SysexMessage/SendRawSysexMessage.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.sound.midi.MidiDevice;
+import javax.sound.midi.MidiMessage;
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.MidiUnavailableException;
+import javax.sound.midi.Receiver;
+import javax.sound.midi.ShortMessage;
+import javax.sound.midi.SysexMessage;
+
+import static javax.sound.midi.SysexMessage.SPECIAL_SYSTEM_EXCLUSIVE;
+import static javax.sound.midi.SysexMessage.SYSTEM_EXCLUSIVE;
+
+/**
+ * @test
+ * @bug 8237495
+ * @summary fail with a dereferenced memory error when asked to send a raw 0xF7
+ */
+public final class SendRawSysexMessage {
+
+    private static final class RawMidiMessage extends MidiMessage {
+        @Override
+        public RawMidiMessage clone() {
+            return new RawMidiMessage(getMessage());
+        }
+        @Override
+        public int getStatus() {
+            return SYSTEM_EXCLUSIVE; // not that this really matters
+        }
+
+        RawMidiMessage(byte[] data) {
+            super(data.clone());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        MidiDevice.Info[] infos = MidiSystem.getMidiDeviceInfo();
+        System.err.println("List of devices to test:");
+        for (int i = 0; i < infos.length; i++) {
+            System.err.printf("\t%d.\t%s%n", i, infos[i]);
+        }
+        for (int i = 0; i < infos.length; i++) {
+            System.err.printf("%d.\t%s%n", i, infos[i]);
+            try {
+                test(infos[i]);
+            } catch (MidiUnavailableException ignored){
+                // try next
+            }
+        }
+    }
+
+    private static void test(MidiDevice.Info info) throws Exception {
+        try (MidiDevice device = MidiSystem.getMidiDevice(info)) {
+            System.err.println("Sending to " + device + " (" + info + ")");
+            if (!device.isOpen())
+                device.open();
+            try (Receiver r = device.getReceiver()) {
+                System.err.println("note on");
+                r.send(new ShortMessage(ShortMessage.NOTE_ON, 5, 5), -1);
+                System.err.println("sysex");
+                r.send(new SysexMessage(new byte[]{
+                        (byte) SYSTEM_EXCLUSIVE, 0x0, 0x03, 0x04,
+                        (byte) SPECIAL_SYSTEM_EXCLUSIVE}, 5), -1);
+                System.err.println("raw 1");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) 0x02, 0x02, 0x03, 0x04}), -1);
+                System.err.println("raw 2");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) 0x09, 0x02, 0x03, 0x04}), -1);
+                System.err.println("raw 3");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) SYSTEM_EXCLUSIVE, 0x02, 0x03, 0x04}), -1);
+                System.err.println("raw 4");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) 0x02, 0x02, 0x03, 0x04}), -1);
+                System.err.println("raw 5");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) 0x02, 0x02, 0x03,
+                        (byte) SPECIAL_SYSTEM_EXCLUSIVE}), -1);
+                System.err.println("raw 6");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) SYSTEM_EXCLUSIVE, 0x02, 0x03, 0x04}), -1);
+                System.err.println("sleep");
+                Thread.sleep(1000);
+                System.err.println("raw 7");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) 0x02, 0x02, 0x03, 0x04}), -1);
+                System.err.println("sleep");
+                Thread.sleep(1000);
+                System.err.println("raw 8");
+                r.send(new RawMidiMessage(new byte[]{
+                        (byte) SPECIAL_SYSTEM_EXCLUSIVE}), -1);
+                System.err.println("note off");
+                r.send(new ShortMessage(ShortMessage.NOTE_OFF, 5, 5), -1);
+                System.err.println("done, should quit");
+                System.err.println();
+            }
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/sound/sampled/Clip/ClipCloseLoss.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/sound/sampled/Clip/ClipCloseLoss.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/sound/sampled/Clip/ClipCloseLoss.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/sound/sampled/Clip/ClipCloseLoss.java	2021-09-01 14:33:15.000000000 +0000
@@ -33,7 +33,7 @@
 
 /**
  * @test
- * @bug 4946913
+ * @bug 4946913 8178403
  * @summary DirectClip doesn't kill the thread correctly, sometimes
  * @run main/othervm ClipCloseLoss
  * @key headful
@@ -47,7 +47,7 @@
     static int success = 0;
     static boolean failed = false;
 
-    public static void run(Mixer m) {
+    public static void run(Mixer m, long sleep) {
         Clip clip = null;
         try {
             if (m == null) {
@@ -69,6 +69,8 @@
             clip.open(new AudioInputStream(bais, format, frameCount));
 
             out(" clip.close()");
+            // emulates a different delay between open() and close()
+            Thread.sleep(sleep);
             //long t = System.currentTimeMillis();
             clip.close();
             //if (System.currentTimeMillis() - t > 1950) {
@@ -107,13 +109,15 @@
     public static void main(String[] args) throws Exception    {
         if (isSoundcardInstalled()) {
             bais.mark(0);
-            run(null);
             Mixer.Info[] infos = AudioSystem.getMixerInfo();
-            for (int i = 0; i<infos.length; i++) {
-                try {
-                    Mixer m = AudioSystem.getMixer(infos[i]);
-                    run(m);
-                } catch (Exception e) {
+            for (int sleep = 0; sleep < 100; ++sleep) {
+                run(null, sleep);
+                for (int i = 0; i < infos.length; i++) {
+                    try {
+                        Mixer m = AudioSystem.getMixer(infos[i]);
+                        run(m, sleep);
+                    } catch (Exception e) {
+                    }
                 }
             }
             out("Waiting 1 second to dispose of all threads");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JComboBox/8032878/bug8032878.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JComboBox/8032878/bug8032878.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JComboBox/8032878/bug8032878.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JComboBox/8032878/bug8032878.java	2021-09-01 14:33:15.000000000 +0000
@@ -22,13 +22,10 @@
  */
 
 /* @test
- * @bug 8032878
+ * @bug 8032878 8078855
  * @summary Checks that JComboBox as JTable cell editor processes key events
  *          even where setSurrendersFocusOnKeystroke flag in JTable is false and
  *          that it does not lose the first key press where the flag is true.
- * @library ../../regtesthelpers
- * @build Util
- * @author Alexey Ivanov
  * @run main bug8032878
  */
 
@@ -36,6 +33,7 @@
 import java.awt.event.KeyEvent;
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 public class bug8032878 implements Runnable {
     private static final String ONE = "one";
@@ -53,6 +51,8 @@
     private volatile String text;
 
     public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel(new MetalLookAndFeel());
+
         final bug8032878 test = new bug8032878();
 
         test.test(false);
@@ -81,6 +81,7 @@
 
         frame.pack();
         frame.setVisible(true);
+        frame.setLocationRelativeTo(null);
     }
 
     private void test(final boolean flag) throws Exception {
@@ -88,11 +89,13 @@
             surrender = flag;
             SwingUtilities.invokeAndWait(this);
 
+            robot.waitForIdle();
+            robot.delay(1000);
             runTest();
             checkResult();
         } finally {
             if (frame != null) {
-                frame.dispose();
+                SwingUtilities.invokeAndWait(() -> frame.dispose());
             }
         }
     }
@@ -100,12 +103,20 @@
     private void runTest() throws Exception {
         robot.waitForIdle();
         // Select 'one'
-        Util.hitKeys(robot, KeyEvent.VK_TAB);
+        robot.keyPress(KeyEvent.VK_TAB);
+        robot.keyRelease(KeyEvent.VK_TAB);
+        robot.waitForIdle();
+        robot.keyPress(KeyEvent.VK_1);
+        robot.keyRelease(KeyEvent.VK_1);
+        robot.waitForIdle();
+        robot.keyPress(KeyEvent.VK_2);
+        robot.keyRelease(KeyEvent.VK_2);
+        robot.waitForIdle();
+        robot.keyPress(KeyEvent.VK_3);
+        robot.keyRelease(KeyEvent.VK_3);
         robot.waitForIdle();
-        Util.hitKeys(robot, KeyEvent.VK_1);
-        Util.hitKeys(robot, KeyEvent.VK_2);
-        Util.hitKeys(robot, KeyEvent.VK_3);
-        Util.hitKeys(robot, KeyEvent.VK_ENTER);
+        robot.keyPress(KeyEvent.VK_ENTER);
+        robot.keyRelease(KeyEvent.VK_ENTER);
         robot.waitForIdle();
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JComboBox/8072767/bug8072767.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JComboBox/8072767/bug8072767.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JComboBox/8072767/bug8072767.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JComboBox/8072767/bug8072767.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ /*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8072767
+ * @author Alexander Scherbatiy
+ * @summary DefaultCellEditor for comboBox creates ActionEvent with wrong source
+ *          object
+ * @run main bug8072767
+ */
+
+public class bug8072767 {
+
+    private static final String TEST1 = "Test";
+    private static final String TEST2 = TEST1 + 1;
+
+    private static JFrame frame;
+    private static JTable table;
+    private static Point point;
+    private static boolean testPass;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        robot.setAutoDelay(50);
+        SwingUtilities.invokeAndWait(bug8072767::createAndShowGUI);
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(() -> {
+            point = table.getLocationOnScreen();
+            Rectangle rect = table.getCellRect(0, 0, true);
+            point.translate(rect.width / 2, rect.height / 2);
+        });
+        robot.mouseMove(point.x, point.y);
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.waitForIdle();
+
+        robot.keyPress(KeyEvent.VK_1);
+        robot.keyRelease(KeyEvent.VK_1);
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            point = frame.getLocationOnScreen();
+            point.translate(frame.getWidth() / 2, frame.getHeight() / 2);
+        });
+
+        robot.mouseMove(point.x, point.y);
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            testPass = TEST2.equals(table.getValueAt(0, 0));
+            frame.dispose();
+        });
+
+        if (!testPass) {
+            throw new RuntimeException("Table cell is not edited!");
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame = new JFrame();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setSize(200, 200);
+        frame.setLocation(100, 100);
+
+        table = new JTable(
+                new String[][]{{TEST1}}, new String[]{"Header"});
+        JComboBox<String> comboBox = new JComboBox<>();
+        comboBox.setEditable(true);
+        table.getColumnModel().getColumn(0).setCellEditor(
+                new DefaultCellEditor(comboBox));
+        frame.getContentPane().add(table);
+        frame.setVisible(true);
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JRadioButton/8075609/bug8075609.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JRadioButton/8075609/bug8075609.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JRadioButton/8075609/bug8075609.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JRadioButton/8075609/bug8075609.java	2021-09-01 14:33:15.000000000 +0000
@@ -35,11 +35,9 @@
 import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
-import sun.awt.SunToolkit;
 
 public class bug8075609 {
     private static Robot robot;
-    private static SunToolkit toolkit;
     private static JTextField textField;
 
     public static void main(String args[]) throws Throwable {
@@ -53,7 +51,6 @@
         Thread.sleep(100);
 
         robot.setAutoDelay(100);
-        toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
 
         // Radio button group tab key test
         runTest1();
@@ -96,10 +93,10 @@
     private static void runTest1() throws Exception{
         hitKey(robot, KeyEvent.VK_TAB);
 
-        robot.setAutoDelay(1000 );
+        robot.delay(1000 );
         SwingUtilities.invokeAndWait(new Runnable() {
             public void run() {
-                if (textField.hasFocus()) {
+                if (!textField.hasFocus()) {
                     System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
                     throw new RuntimeException("Focus is not on textField as Expected");
                 }
@@ -110,6 +107,6 @@
     private static void hitKey(Robot robot, int keycode) {
         robot.keyPress(keycode);
         robot.keyRelease(keycode);
-        toolkit.realSync();
+        robot.waitForIdle();
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JScrollBar/bug4202954/bug4202954.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/JScrollBar/bug4202954/bug4202954.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/JScrollBar/bug4202954/bug4202954.java	2021-09-01 14:33:15.000000000 +0000
@@ -53,8 +53,8 @@
 
         if (rightScrollButton == null || bottomScrollButton == null) {
             String errMessage = "Test can't be executed: ";
-            errMessage = errMessage + rightScrollButton == null ? "can't find right button for horizontal scroll bar; " : ""
-                    + bottomScrollButton == null ? "can't find bottom scroll button for vertical scroll bar" : "";
+            errMessage = errMessage + (rightScrollButton == null ? "can't find right button for horizontal scroll bar; " : ""
+                    + (bottomScrollButton == null ? "can't find bottom scroll button for vertical scroll bar" : ""));
             throw new RuntimeException(errMessage);
         }
 
@@ -105,15 +105,25 @@
         JButton button = Util.invokeOnEDT(new java.util.concurrent.Callable<JButton>() {
             @Override
             public JButton call() throws Exception {
-                for (Component c: scrollBar.getComponents()) {
-                    if (c instanceof JButton) {
-                        Point p = c.getLocationOnScreen();
-                        if (p.x > minX && p.y > minY) {
-                            return (JButton) c;
-                        }
-                    }
-                }
-                return null;
+                int currentXorY = 0;
+                JButton scrollButton = null;
+                 for (Component c: scrollBar.getComponents()) {
+                     if (c instanceof JButton) {
+                         Point p = c.getLocationOnScreen();
+                         if (scrollBar.getOrientation() == Adjustable.VERTICAL){
+                             if (currentXorY <= p.y){
+                                 currentXorY = p.y;
+                                 scrollButton = (JButton)c;
+                             }
+                         }else  if (scrollBar.getOrientation() == Adjustable.HORIZONTAL){
+                             if (currentXorY <= p.x){
+                                 currentXorY = p.x;
+                                 scrollButton = (JButton)c;
+                             }
+                         }
+                     }
+                 }
+                return scrollButton;
             }
         });
         return button;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -22,9 +22,11 @@
  */
 
 /* @test
-   @bug     8073001
+   @bug     8073001 8081764
    @summary Test verifies that combo box with custom editor renders
             focus ring around arrow button correctly.
+   @library /lib/testlibrary
+   @build jdk.testlibrary.OSInfo
    @run     main CustomComboBoxFocusTest
 */
 
@@ -50,12 +52,17 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
+import jdk.testlibrary.OSInfo;
 
 public class CustomComboBoxFocusTest {
 
     private static CustomComboBoxFocusTest test = null;
 
     public static void main(String[] args) {
+        if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) {
+            System.out.println("Only Mac platform test. Test is skipped for other OS.");
+            return;
+        }
 
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/xml/crypto/dsig/GenerationTests.java openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/xml/crypto/dsig/GenerationTests.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/javax/xml/crypto/dsig/GenerationTests.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/javax/xml/crypto/dsig/GenerationTests.java	2021-09-01 14:33:15.000000000 +0000
@@ -1402,7 +1402,6 @@
         DOMValidateContext dvc = new DOMValidateContext
             (ks, doc.getDocumentElement());
         File f = new File(DATA_DIR);
-        dvc.setBaseURI(f.toURI().toString());
         dvc.setURIDereferencer(httpUd);
 
         XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
@@ -2158,6 +2157,12 @@
                         (DATA_DIR, uri.substring(uri.lastIndexOf('/'))));
                     return new OctetStreamData(fis,ref.getURI(),ref.getType());
                 } catch (Exception e) { throw new URIReferenceException(e); }
+            } else if (uri.startsWith("certs/")) {
+                try {
+                    FileInputStream fis = new FileInputStream(new File
+                            (DATA_DIR, uri));
+                    return new OctetStreamData(fis,ref.getURI(),ref.getType());
+                } catch (Exception e) { throw new URIReferenceException(e); }
             }
 
             // fallback on builtin deref
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @bug 8153732 8212202 8221263 8221412 8222108
+ * @bug 8153732 8212202 8221263 8221412 8222108 8263311
  * @requires (os.family == "Windows")
  * @summary Windows remote printer changes do not reflect in lookupPrintServices()
- * @run main/manual/othervm -Dsun.java2d.print.minRefreshTime=120 RemotePrinterStatusRefresh
+ * @run main/manual RemotePrinterStatusRefresh
  */
 
 import java.awt.BorderLayout;
@@ -63,12 +63,7 @@
 
 public class RemotePrinterStatusRefresh extends WindowAdapter {
 
-    private static final long DEFAULT_REFRESH_TIME = 240L;
-    private static final long MINIMAL_REFRESH_TIME = 120L;
-
-    private static final long refreshTime = getRefreshTime();
-
-    private static final long TIMEOUT = refreshTime * 4 + 60;
+    private static final long TIMEOUT = 15L * 60;
 
 
     private static final CountDownLatch latch = new CountDownLatch(1);
@@ -86,7 +81,6 @@
     private final ServiceItemListModel beforeList;
     private final ServiceItemListModel afterList;
 
-    private JTextField nextRefresh;
     private JTextField timeLeft;
 
     private final Timer timer;
@@ -184,22 +178,18 @@
                     +          "configured printers.\n"
                     + "Step 1: Add or Remove a network printer using "
                     +          "Windows Control Panel.\n"
-                    + "Step 2: Wait for 2\u20134 minutes after adding or removing.\n"
-                    + "             \"Next printer refresh in\" gives you a "
-                    +          "rough estimation on when update will happen.\n"
-                    + "Step 3: Click Refresh."
+                    + "Step 2: Click Refresh."
                     +          "\"After\" list is populated with updated list "
                     +          "of printers.\n"
-                    + "Step 4: Compare the list of printers in \"Before\" and "
+                    + "Step 3: Compare the list of printers in \"Before\" and "
                     +          "\"After\" lists.\n"
                     + "              Added printers are highlighted with "
                     +               "green color, removed ones \u2014 with "
                     +               "red color.\n"
-                    + "Step 5: Click Pass if the list of printers is correctly "
+                    + "Step 4: Click Pass if the list of printers is correctly "
                     +          "updated.\n"
-                    + "Step 6: If the list is not updated, wait for another "
-                    +          "2\u20134 minutes, and then click Refresh again.\n"
-                    + "Step 7: If the list does not update, click Fail.\n"
+                    + "Step 5: If the list is not updated, click Refresh again.\n"
+                    + "Step 6: If the list does not update, click Fail.\n"
                     + "\n"
                     + "You have to click Refresh to enable Pass and Fail buttons. "
                     + "If no button is pressed,\n"
@@ -216,18 +206,6 @@
         }
     }
 
-    private static long getRefreshTime() {
-        String refreshTime =
-                System.getProperty("sun.java2d.print.minRefreshTime",
-                                   Long.toString(DEFAULT_REFRESH_TIME));
-        try {
-            long value = Long.parseLong(refreshTime);
-            return value < MINIMAL_REFRESH_TIME ? MINIMAL_REFRESH_TIME : value;
-        } catch (NumberFormatException e) {
-            return DEFAULT_REFRESH_TIME;
-        }
-    }
-
     private static void createUI() {
         test = new RemotePrinterStatusRefresh();
     }
@@ -278,31 +256,6 @@
         javaVersion.setEditable(false);
         javaLabel.setLabelFor(javaVersion);
 
-        JLabel refreshTimeLabel = new JLabel("Refresh interval:");
-        long minutes = refreshTime / 60;
-        long seconds = refreshTime % 60;
-        String interval = String.format("%1$d seconds%2$s",
-                refreshTime,
-                minutes > 0
-                    ? String.format(" (%1$d %2$s%3$s)",
-                        minutes,
-                        minutes > 1 ? "minutes" : "minute",
-                        seconds > 0
-                            ? String.format(" %1$d %2$s",
-                                seconds,
-                                seconds > 1 ? "seconds" : "second")
-                            : "")
-                    : ""
-        );
-        JTextField refreshInterval = new JTextField(interval);
-        refreshInterval.setEditable(false);
-        refreshTimeLabel.setLabelFor(refreshInterval);
-
-        JLabel nextRefreshLabel = new JLabel("Next printer refresh in:");
-        nextRefresh = new JTextField();
-        nextRefresh.setEditable(false);
-        nextRefreshLabel.setLabelFor(nextRefresh);
-
         JLabel timeoutLabel = new JLabel("Time left:");
         timeLeft = new JTextField();
         timeLeft.setEditable(false);
@@ -317,14 +270,10 @@
             layout.createSequentialGroup()
                 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(javaLabel)
-                    .addComponent(refreshTimeLabel)
-                    .addComponent(nextRefreshLabel)
                     .addComponent(timeoutLabel)
                 )
                 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING, true)
                     .addComponent(javaVersion)
-                    .addComponent(refreshInterval)
-                    .addComponent(nextRefresh)
                     .addComponent(timeLeft)
                 )
         );
@@ -335,12 +284,6 @@
                     .addComponent(javaVersion)
                 )
                 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                    .addComponent(refreshTimeLabel)
-                    .addComponent(refreshInterval))
-                .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                    .addComponent(nextRefreshLabel)
-                    .addComponent(nextRefresh))
-                .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                     .addComponent(timeoutLabel)
                     .addComponent(timeLeft))
         );
@@ -493,7 +436,6 @@
             disposeUI();
         }
         timeLeft.setText(formatTime(left));
-        nextRefresh.setText(formatTime(refreshTime - (elapsed % refreshTime)));
     }
 
     private static String formatTime(final long seconds) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/event/gc/detailed/ExecuteOOMApp.java openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/event/gc/detailed/ExecuteOOMApp.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/event/gc/detailed/ExecuteOOMApp.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/event/gc/detailed/ExecuteOOMApp.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -51,7 +51,7 @@
         OutputAnalyzer out = AppExecutorHelper.executeAndRecord(settings, jfrFilename, additionalVmFlagsList.toArray(new String[0]),
                                                                 OOMApp.class.getName(), String.valueOf(bytesToAllocate));
 
-        if ((out.getExitValue() == 1 && out.getOutput().contains("Exception: java.lang.OutOfMemoryError"))) {
+        if ((out.getExitValue() == 1 && out.getOutput().contains("java.lang.OutOfMemoryError"))) {
             return false;
         }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/startupargs/TestBadOptionValues.java openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/startupargs/TestBadOptionValues.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/startupargs/TestBadOptionValues.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/startupargs/TestBadOptionValues.java	2021-09-01 14:33:15.000000000 +0000
@@ -28,6 +28,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import sun.hotspot.WhiteBox;
 
 /**
  * @test
@@ -38,7 +39,10 @@
  *
 
  *
- * @run main jdk.jfr.startupargs.TestBadOptionValues
+ * @build ClassFileInstaller
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI jdk.jfr.startupargs.TestBadOptionValues
  */
 public class TestBadOptionValues {
 
@@ -120,6 +124,31 @@
         test(START_FLIGHT_RECORDING, "Parsing error memory size value: invalid value",
             "maxsize=");
 
+        // globalbuffersize exceeds limit
+        test(FLIGHT_RECORDER_OPTIONS, "This value is higher than the maximum size limit",
+            "globalbuffersize=4G");
+
+        // threadbuffersize exceeds limit
+        test(FLIGHT_RECORDER_OPTIONS, "This value is higher than the maximum size limit",
+            "threadbuffersize=4G");
+
+        // computed numglobalbuffers smaller than MIN_BUFFER_COUNT
+        test(FLIGHT_RECORDER_OPTIONS, "Decrease globalbuffersize/threadbuffersize or increase memorysize",
+            "memorysize=1m,globalbuffersize=1m");
+
+        // memorysize smaller than threadbuffersize
+        test(FLIGHT_RECORDER_OPTIONS, "The value for option \"threadbuffersize\" should not be larger than the value specified for option \"memorysize\"",
+            "memorysize=1m,threadbuffersize=2m");
+
+        // computed globalbuffersize smaller than threadbuffersize
+        // test is on when vm page isn't larger than 4K, avoiding both buffer sizes align to vm page size
+        WhiteBox wb = WhiteBox.getWhiteBox();
+        long smallPageSize = wb.getVMPageSize();
+        if (smallPageSize <= 4096) {
+            test(FLIGHT_RECORDER_OPTIONS, "Decrease globalbuffersize or increase memorysize or adjust global/threadbuffersize",
+                "memorysize=1m,numglobalbuffers=256");
+        }
+
         test(FLIGHT_RECORDER_OPTIONS, "Parsing error memory size value: invalid value",
             "threadbuffersize=a",
             "globalbuffersize=G",
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/startupargs/TestMemoryOptions.java openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/startupargs/TestMemoryOptions.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/jfr/startupargs/TestMemoryOptions.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/jfr/startupargs/TestMemoryOptions.java	2021-09-01 14:33:15.000000000 +0000
@@ -645,6 +645,11 @@
         tc.setGlobalBufferSizeTestParam(64, 'k');
         tc.setGlobalBufferCountTestParam(16, 'b');
         testCases.add(tc);
+
+        // threadbuffersize exceeds default memorysize
+        tc = new TestCase("ThreadBufferSizeExceedMemorySize", false);
+        tc.setThreadBufferSizeTestParam(30, 'm');
+        testCases.add(tc);
     }
 
     public static void main(String[] args) throws Exception {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8256421
+ * @summary Interoperability tests with Harica CAs
+ * @build ValidatePathWithParams
+ * @run main/othervm -Djava.security.debug=certpath HaricaCA OCSP
+ * @run main/othervm -Djava.security.debug=certpath HaricaCA CRL
+ */
+
+/*
+ * Obtain test artifacts for Harica CA from:
+ *
+ * CA has no published test sites so we will need to communicate with CA for test.
+ */
+public class HaricaCA {
+
+    public static void main(String[] args) throws Exception {
+
+        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
+        boolean ocspEnabled = false;
+
+        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
+            pathValidator.enableCRLCheck();
+        } else {
+            // OCSP check by default
+            pathValidator.enableOCSPCheck();
+            ocspEnabled = true;
+        }
+
+        new Harica_CA().runTest(pathValidator, ocspEnabled);
+        new Harica_ECC().runTest(pathValidator, ocspEnabled);
+    }
+}
+
+class Harica_CA {
+
+    // Owner: CN=Hellenic Academic and Research Institutions Code Signing CA R1,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Serial number: 1bc8b59e0cea0b7c
+    // Valid from: Fri Apr 08 00:37:41 PDT 2016 until: Sat Apr 06 00:37:41 PDT 2024
+    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIHnjCCBYagAwIBAgIIG8i1ngzqC3wwDQYJKoZIhvcNAQELBQAwgaYxCzAJBgNV\n" +
+            "BAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmljIEFjYWRl\n" +
+            "bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAw\n" +
+            "PgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRp\n" +
+            "b25zIFJvb3RDQSAyMDE1MB4XDTE2MDQwODA3Mzc0MVoXDTI0MDQwNjA3Mzc0MVow\n" +
+            "ga0xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxl\n" +
+            "bmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0\n" +
+            "aG9yaXR5MUcwRQYDVQQDEz5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg\n" +
+            "SW5zdGl0dXRpb25zIENvZGUgU2lnbmluZyBDQSBSMTCCAiIwDQYJKoZIhvcNAQEB\n" +
+            "BQADggIPADCCAgoCggIBAJYQhJz8QjfP1wOc1sHxTKe9wy7d3oBScTslX5Yn1IE8\n" +
+            "j5SzsKilvbu9rp8bd8IKHnPrl1Vnjpvna/Vx/XKlXDxnIxgfLINfmbjJRoEbzj1t\n" +
+            "fxdTnZSN5c6vHYr5112/XCr2VQ7gIL+2jujXlJQYs/aUzAb9RR35dy4z2tQJQwtA\n" +
+            "gG/paNGgnOU2ROrcaEYfvG4YQWaHAwqjJ53ZY5HVD7NmLp5SZTA5Q3eHAYae99fq\n" +
+            "iEgMti3zMejzrAM1h+iVpLUxA7iMFh5nwCOvYJWVYqN3YOEmksxh7HOWlpe1PgDT\n" +
+            "5SezPCHmOilNizMSRsdW7fE8apYVq/O0yStFW32kS9RQzYiBsdgPvNzDGec7Jj8X\n" +
+            "SozhS6to+A6RdgfpHccHc2jhIRkFocA63OEde3Eo/NPf/WbFX2tpgDIv+HF/YZV3\n" +
+            "iaMeKeOKDIxa4c3t3qBsZNtFEGOQyDouVH4g2Y8gHhUCcR7gQrHEYy/9FbtUDviu\n" +
+            "abBVPFnNbEwT0uKS20aLgldkJ4/b3UzeTVzXVwLB8ruBfZX/e60YFaUJAZbbYRbE\n" +
+            "mD6KmDOCTfalpBRhXar6U1wf+GRp1wv01Vw88EJ6VEBxXAYrfQ28ER9IuLqVQRlN\n" +
+            "xpZCP71DRCvWljkXAKvWrs3JAw926n5K7sL+fv6mn+6iGBHrSEcyX8g8EZv6XuLP\n" +
+            "AgMBAAGjggHFMIIBwTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAT\n" +
+            "BgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUDyz8Ez5xsy3SqelOr4FBCaaY\n" +
+            "3UgwRgYDVR0fBD8wPTA7oDmgN4Y1aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJp\n" +
+            "Y2FSb290Q0EyMDE1L2NybHYxLmRlci5jcmwwHwYDVR0jBBgwFoAUcRVnyMjJvXVd\n" +
+            "ctA4GGqd83EkVAswbgYIKwYBBQUHAQEEYjBgMCEGCCsGAQUFBzABhhVodHRwOi8v\n" +
+            "b2NzcC5oYXJpY2EuZ3IwOwYIKwYBBQUHMAKGL2h0dHA6Ly93d3cuaGFyaWNhLmdy\n" +
+            "L2NlcnRzL0hhcmljYVJvb3RDQTIwMTUuY3J0MIGQBgNVHSAEgYgwgYUwgYIGBFUd\n" +
+            "IAAwejAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5oYXJpY2EuZ3IvZG9jdW1lbnRz\n" +
+            "L0NQUy5waHAwRAYIKwYBBQUHAgIwOAw2VGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJq\n" +
+            "ZWN0IHRvIEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuMA0GCSqGSIb3DQEBCwUAA4IC\n" +
+            "AQA2t84B3ImFaWsnaYoPxwYu9njKaDc/QsaxT4AKP8env/Zr+fjD5s0Bjd1gZijC\n" +
+            "9LRTzIovpldc/yADy7SVboIH0uNEiBC0kc0DaCq0ceCGIe6dw92Mu9DJ3UpMGAuF\n" +
+            "fLpyearmfX9qzi0KhPGhjTxSTD4vWw3E0nvDVMBG54Im0OUGeVzZ9SpvRRhRnPOk\n" +
+            "1eplEYRRDVTGYQJ84GdVC4H4U3TjlbO9gppeSnBoVHyCqDDpyd8HhTuY3P5VRWaf\n" +
+            "dvAkwrW2Vv53zIYpDtcwG7mf4UXKbfYGtOIg/xaqHV82J6MYZHW1RNIlSh7F+1S5\n" +
+            "XamkPCQZZI87CMt/OZH+RaO87Vr2V02wkYwEeAvjOwq9l7LtOJaOznKS+BlMi009\n" +
+            "ljgHWUQcA2wk25hOAS3YtvhI1l2UrRHSqmHd7Jah4clskIjURt3b2Ez9nuZh1dC8\n" +
+            "NfaoPCkpK3leLBezubtq48MRe5jkAgen5UXvxq9zOZSen4pYeBK72ugNyLjzOhY8\n" +
+            "GrSeE1voLnvyZIguM2hrI8nEjI4rSXL6lsqXyG/ODzDMMdKq4FrjoW3y9KnV/n8t\n" +
+            "BvKTAlDcXQTqfdTykDWnxwNTp6dU+MOom9LGy6ZNFbei7XuvjrREiXUEJ/I2dGSD\n" +
+            "3zeNek32BS2BBZNN8jeP4szLs85G5HWql59OyePZfARA6Q==\n" +
+            "-----END CERTIFICATE-----";
+
+    // Owner: OID.1.3.6.1.4.1.311.60.2.1.3=GR, OID.2.5.4.15=Private Organization,
+    // CN=Greek Universities Network (GUnet), SERIALNUMBER=VATGR-099028220,
+    // OU=Class A - Private Key created and stored in hardware CSP, O=Greek Universities Network, L=Athens, C=GR
+    // Issuer: CN=Hellenic Academic and Research Institutions Code Signing CA R1,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Serial number: 2c9a7af519251c645c1bed40b9d1aeca
+    // Valid from: Mon Sep 09 01:15:13 PDT 2019 until: Wed Sep 08 01:15:13 PDT 2021
+    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIGyzCCBLOgAwIBAgIQLJp69RklHGRcG+1AudGuyjANBgkqhkiG9w0BAQsFADCB\n" +
+            "rTELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVu\n" +
+            "aWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRo\n" +
+            "b3JpdHkxRzBFBgNVBAMTPkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJ\n" +
+            "bnN0aXR1dGlvbnMgQ29kZSBTaWduaW5nIENBIFIxMB4XDTE5MDkwOTA4MTUxM1oX\n" +
+            "DTIxMDkwODA4MTUxM1owggEBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5z\n" +
+            "MSMwIQYDVQQKDBpHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yazFBMD8GA1UECww4\n" +
+            "Q2xhc3MgQSAtIFByaXZhdGUgS2V5IGNyZWF0ZWQgYW5kIHN0b3JlZCBpbiBoYXJk\n" +
+            "d2FyZSBDU1AxGDAWBgNVBAUTD1ZBVEdSLTA5OTAyODIyMDErMCkGA1UEAwwiR3Jl\n" +
+            "ZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEdMBsGA1UEDwwUUHJpdmF0\n" +
+            "ZSBPcmdhbml6YXRpb24xEzARBgsrBgEEAYI3PAIBAxMCR1IwggEiMA0GCSqGSIb3\n" +
+            "DQEBAQUAA4IBDwAwggEKAoIBAQDdkvuJzgjD3Hr1RoDtPZPp5ZelMl6Xh5vnKVuG\n" +
+            "KX9gwHbDaXpLkp2bF2497R3olBaeYcEgappsWLPvLMEA75BSRopFQmhX3PAsjfAG\n" +
+            "JZGM3A53n4NAQscCmtD6echJi4P6RThRcpfqObfe0vqZUVzSWRC8fU1P4lt/KzJj\n" +
+            "DGSJtOP/SJfgp3M7hEp54fn+15DlYp+0e4aa5HF2HpGIy2ghPbRvkMJWbHmp3KZG\n" +
+            "NOXViQdr/ogpqRsbdP7kN78WLhwrLu+xRUmf9A845jxyNO7269jOQHztfPAcgvDw\n" +
+            "NbZouGtN3IIWoXWMLipNgzC9CYdqgLsLI9lXV9oQrXaICQ27AgMBAAGjggGOMIIB\n" +
+            "ijAfBgNVHSMEGDAWgBQPLPwTPnGzLdKp6U6vgUEJppjdSDB0BggrBgEFBQcBAQRo\n" +
+            "MGYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9yZXBvLmhhcmljYS5nci9jZXJ0cy9IYXJp\n" +
+            "Y2FDb2RlU2lnbmluZ0NBUjEuY3J0MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5o\n" +
+            "YXJpY2EuZ3IwYAYDVR0gBFkwVzAHBgVngQwBAzAIBgYEAI96AQIwQgYMKwYBBAGB\n" +
+            "zxEBAQMDMDIwMAYIKwYBBQUHAgEWJGh0dHBzOi8vcmVwby5oYXJpY2EuZ3IvZG9j\n" +
+            "dW1lbnRzL0NQUzATBgNVHSUEDDAKBggrBgEFBQcDAzBLBgNVHR8ERDBCMECgPqA8\n" +
+            "hjpodHRwOi8vY3JsdjEuaGFyaWNhLmdyL0hhcmljYUNvZGVTaWduaW5nQ0FSMS9j\n" +
+            "cmx2MS5kZXIuY3JsMB0GA1UdDgQWBBR0K0c/UEGkfRtqAEwoONenOUa0WTAOBgNV\n" +
+            "HQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBAHXVdzMwKeZSWmXZu/MyoyH8\n" +
+            "yTHYi/yvaPpR88/Q/j5wxzuceECZJgH74xgePCIXx74IKTADUyIj7eWuTkzEnZF9\n" +
+            "yqJyG+tArrIH7zdnjC0OgbJVFeUUY45rS24u8n/+46LnXy4A+bRa0qX/QikHxMvj\n" +
+            "0I0/RTZpdQFjhnmhZyZzUWReFlAEG1fUz9TNwcCfGrv3z6YHCNAh/HWFtM7te6H7\n" +
+            "LNjoRw0fC5edqI16ca2VrOLObbg64zdk7Ll/fu3Ll5UcAthve/PTez6R1wm47ETT\n" +
+            "ItjinmQI3vRhIls/UwvF4ey5Linz80rnzIlrrMgn3G2gRpfJ55CxsXOZDGS9iy8C\n" +
+            "jU8EiKkjbdDH6mOdQO11+FlwhBwSxVbr004RDPJJqKHKtKTWx6mEbW+ZrMXaEUNZ\n" +
+            "mSPwDCUgDzrFfSspYJL0UW7zV+SbK9u5nf09m6qOpkZ5OE91IEpkotTWqMe/yOJu\n" +
+            "Yey5wvAmEqQM6fcQCTfV5JBtzU5LOsm5Uwg728DcHfal21dJWtY3fi7+CgDRutU3\n" +
+            "Ee8uZUmCd/KCSQgP8B/QTu7wLXHd4IQz2EP2tmN9Zrv/MsDjpSHgRrU6Hwi49bPQ\n" +
+            "R43rmXHC7e2GZpBdPsfG0VDnpzgCx5Kogi5nJwwUevbvC2CT11AAlaOmTQPflqQj\n" +
+            "w2LPatMDMTAga/l+CE8j\n" +
+            "-----END CERTIFICATE-----";
+
+    // Owner: CN=Greek Universities Network (GUnet), SERIALNUMBER=VATGR-099028220,
+    // OU=Class B - Private Key created and stored in software CSP, O=Greek Universities Network, L=Athens, C=GR
+    // Issuer: CN=Hellenic Academic and Research Institutions Code Signing CA R1,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Serial number: 29c4a7abf35bd0acb1638abbf22da1d3
+    // Valid from: Mon Feb 17 01:47:19 PST 2020 until: Mon Feb 15 16:00:00 PST 2021
+    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIGmDCCBICgAwIBAgIQKcSnq/Nb0KyxY4q78i2h0zANBgkqhkiG9w0BAQsFADCB\n" +
+            "rTELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVu\n" +
+            "aWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRo\n" +
+            "b3JpdHkxRzBFBgNVBAMTPkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJ\n" +
+            "bnN0aXR1dGlvbnMgQ29kZSBTaWduaW5nIENBIFIxMB4XDTIwMDIxNzA5NDcxOVoX\n" +
+            "DTIxMDIxNjAwMDAwMFowgc0xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMx\n" +
+            "IzAhBgNVBAoMGkdyZWVrIFVuaXZlcnNpdGllcyBOZXR3b3JrMUEwPwYDVQQLDDhD\n" +
+            "bGFzcyBCIC0gUHJpdmF0ZSBLZXkgY3JlYXRlZCBhbmQgc3RvcmVkIGluIHNvZnR3\n" +
+            "YXJlIENTUDEYMBYGA1UEBRMPVkFUR1ItMDk5MDI4MjIwMSswKQYDVQQDDCJHcmVl\n" +
+            "ayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMIIBIjANBgkqhkiG9w0BAQEF\n" +
+            "AAOCAQ8AMIIBCgKCAQEArSBfy0xwIHpFxFrAHiYpMOkILjOvlhRCBmfzrJFSILou\n" +
+            "8vc1wxZw/olBa38khtIybE0GJnzZqoFTsalAcLg0CzfqucDoWL+uVLURmEmYZExj\n" +
+            "ngYfjrpB7ypjWqxfBVqqLgxugY1XV3oaQRNWgFEn/mrQhv+0azySJdRSiW0BH4rP\n" +
+            "wXp9LHgzHc7oxVOHsOKApwRN7TRVKz0/EoPhyUzdk5xoRTQMRalwZ0/E24v+CyoF\n" +
+            "bPl/v+dlRK5n9It8yjCtqOMZ1z7l8sKmJ7q9iLvzAF58a8B5lPueC+opHPEy4VD0\n" +
+            "7xZHYgdHliDsVIcWDXAzfcfo7l9EUX17onEXKMWKDwIDAQABo4IBkDCCAYwwHwYD\n" +
+            "VR0jBBgwFoAUDyz8Ez5xsy3SqelOr4FBCaaY3UgwdAYIKwYBBQUHAQEEaDBmMEEG\n" +
+            "CCsGAQUFBzAChjVodHRwOi8vcmVwby5oYXJpY2EuZ3IvY2VydHMvSGFyaWNhQ29k\n" +
+            "ZVNpZ25pbmdDQVIxLmNydDAhBggrBgEFBQcwAYYVaHR0cDovL29jc3AuaGFyaWNh\n" +
+            "LmdyMGIGA1UdIARbMFkwCAYGZ4EMAQQBMAgGBgQAj3oBATBDBg0rBgEEAYHPEQEB\n" +
+            "AwEBMDIwMAYIKwYBBQUHAgEWJGh0dHBzOi8vcmVwby5oYXJpY2EuZ3IvZG9jdW1l\n" +
+            "bnRzL0NQUzATBgNVHSUEDDAKBggrBgEFBQcDAzBLBgNVHR8ERDBCMECgPqA8hjpo\n" +
+            "dHRwOi8vY3JsdjEuaGFyaWNhLmdyL0hhcmljYUNvZGVTaWduaW5nQ0FSMS9jcmx2\n" +
+            "MS5kZXIuY3JsMB0GA1UdDgQWBBTj6v8Qkmosm+VNGsd/prwylbsM7TAOBgNVHQ8B\n" +
+            "Af8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBADYBQvc68KwX28UFeE/nXcowBTSd\n" +
+            "z+tQexloeBa4Z5G0yRr9URPc95H1R4SJiGQxb/KKqX2LqZtowc5rOXFBchI3da24\n" +
+            "kn8pmoi4/U2o8iS+DSlAMsn4ZW2lyDd0jyNeRiuZXvkdpqxa9u/x0TyXJ6qUxSYM\n" +
+            "oUC/H7RI1rxA+NgQ+otLHVs4ye53qzO44mXJv5Qq4dQ+GEdD+dShrYs69WMC0mV0\n" +
+            "mVs//R1qp8G3tThAiJJF55kV8w1JH2+yv8RXAdQ2cRpN2W6wsnm2DxldHKM4Kel4\n" +
+            "ON0TXlARGjoGqfEjFyZYtvpjzIPGoj3MHgCdiVb+zQJavYZJfLymlnIXajVb80Hh\n" +
+            "9xSar/uZ0NwtZgX8EwOrBiDUuCjyvlYrcbpSN26Q4fuUfPdIJQXMQDLTFMQLQ/o4\n" +
+            "5dn9FLLaJF7CA8VFeyJYi9pWEiIIpmPzIibd2+CAEQ43Q87GAvLpC09Rf6yggRh5\n" +
+            "by/FAOOzfbEQMhvJfGcJrPeG8JdzG95N5ycAeeyb/iboYptRwsLWwurASmUEKn0y\n" +
+            "BHlQPhut0mqNJQsoxvW6yIipFAQPBxfRHeLG71UO1kRxCleDTMsb3Zzt8hv1G4+m\n" +
+            "Nsm3ZMOV8TMdlBxYO/xA9dqwAxMuPvShx6LdiiyQhdeEmIFvKZeTD22cIOVLDsrd\n" +
+            "D2GbhbvPInvh21Qz\n" +
+            "-----END CERTIFICATE-----";
+
+    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
+        // Validate valid
+        pathValidator.validate(new String[]{VALID, INT},
+                ValidatePathWithParams.Status.GOOD, null, System.out);
+
+        // Validate Revoked
+        pathValidator.validate(new String[]{REVOKED, INT},
+                ValidatePathWithParams.Status.REVOKED,
+                "Mon Feb 17 02:00:10 PST 2020", System.out);
+    }
+}
+
+class Harica_ECC {
+
+    // Owner: CN=HARICA Code Signing ECC SubCA R2,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Serial number: 1f6ea9c2f4d7f80ee6a046d8b822dd3f
+    // Valid from: Wed Mar 06 02:49:26 PST 2019 until: Thu Mar 02 02:49:26 PST 2034
+    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDxzCCA02gAwIBAgIQH26pwvTX+A7moEbYuCLdPzAKBggqhkjOPQQDAzCBqjEL\n" +
+            "MAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg\n" +
+            "QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3Jp\n" +
+            "dHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0\n" +
+            "aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE5MDMwNjEwNDkyNloXDTM0MDMw\n" +
+            "MjEwNDkyNlowgY8xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxRDBCBgNV\n" +
+            "BAoMO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMg\n" +
+            "Q2VydC4gQXV0aG9yaXR5MSkwJwYDVQQDDCBIQVJJQ0EgQ29kZSBTaWduaW5nIEVD\n" +
+            "QyBTdWJDQSBSMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABKPWDfLT76KnCZ7dujms\n" +
+            "bFYFLTvCWTyk8l0JqdhvZ+Tk6dWYAViIX90fc8+3HPAdHvkofNWvI/PW0qlZoRn3\n" +
+            "De/Nrp+ZCWjg7UrUrmKH2z/N3A7lgZFqrwlWPxHSPSYVkqOCAU8wggFLMBIGA1Ud\n" +
+            "EwEB/wQIMAYBAf8CAQAwHwYDVR0jBBgwFoAUtCILgpkkAQ6cu+QO/b/7lyCTmSow\n" +
+            "cgYIKwYBBQUHAQEEZjBkMD8GCCsGAQUFBzAChjNodHRwOi8vcmVwby5oYXJpY2Eu\n" +
+            "Z3IvY2VydHMvSGFyaWNhRUNDUm9vdENBMjAxNS5jcnQwIQYIKwYBBQUHMAGGFWh0\n" +
+            "dHA6Ly9vY3NwLmhhcmljYS5ncjARBgNVHSAECjAIMAYGBFUdIAAwEwYDVR0lBAww\n" +
+            "CgYIKwYBBQUHAwMwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybHYxLmhhcmlj\n" +
+            "YS5nci9IYXJpY2FFQ0NSb290Q0EyMDE1L2NybHYxLmRlci5jcmwwHQYDVR0OBBYE\n" +
+            "FMdgA8SpJhybKTZTnW4Xu3NWRKZeMA4GA1UdDwEB/wQEAwIBhjAKBggqhkjOPQQD\n" +
+            "AwNoADBlAjAcJj7q9ujC+87/b81QowGo87VJhn9XWzRtpwjQFbIilqEfO3ot1d5F\n" +
+            "MWT1Xn2Qg3sCMQCoM+eV2KkQluHn2N6+GMImJqVObVUyZv0E+BvvszdJubo1cAM0\n" +
+            "SUImVT1t2wZpJKg=\n" +
+            "-----END CERTIFICATE-----";
+
+    // Owner: CN=Dimitrios Zacharopoulos, GIVENNAME=Dimitrios, SURNAME=Zacharopoulos,
+    // OU=Class B - Private Key created and stored in software CSP,
+    // O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
+    // Issuer: CN=HARICA Code Signing ECC SubCA R2, O=Hellenic Academic and Research Institutions Cert. Authority,
+    // L=Athens, C=GR
+    // Serial number: 11a187e3b5b0eabea4ba4987e76cd09d
+    // Valid from: Fri Jul 31 02:11:08 PDT 2020 until: Sun Jul 31 02:11:08 PDT 2022
+    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIENTCCA7ugAwIBAgIQEaGH47Ww6r6kukmH52zQnTAKBggqhkjOPQQDAzCBjzEL\n" +
+            "MAkGA1UEBhMCR1IxDzANBgNVBAcMBkF0aGVuczFEMEIGA1UECgw7SGVsbGVuaWMg\n" +
+            "QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3Jp\n" +
+            "dHkxKTAnBgNVBAMMIEhBUklDQSBDb2RlIFNpZ25pbmcgRUNDIFN1YkNBIFIyMB4X\n" +
+            "DTIwMDczMTA5MTEwOFoXDTIyMDczMTA5MTEwOFowgfUxCzAJBgNVBAYTAkdSMQ8w\n" +
+            "DQYDVQQHDAZBdGhlbnMxRDBCBgNVBAoMO0hlbGxlbmljIEFjYWRlbWljIGFuZCBS\n" +
+            "ZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUEwPwYDVQQLDDhD\n" +
+            "bGFzcyBCIC0gUHJpdmF0ZSBLZXkgY3JlYXRlZCBhbmQgc3RvcmVkIGluIHNvZnR3\n" +
+            "YXJlIENTUDEWMBQGA1UEBAwNWmFjaGFyb3BvdWxvczESMBAGA1UEKgwJRGltaXRy\n" +
+            "aW9zMSAwHgYDVQQDDBdEaW1pdHJpb3MgWmFjaGFyb3BvdWxvczBZMBMGByqGSM49\n" +
+            "AgEGCCqGSM49AwEHA0IABOzRSqoI9HoxXjWerBBw8Croi1bJlUzoFXGjdszJIThf\n" +
+            "UG3YOiR1whG7wY5H5v8v4IIB5pJanArJk4CzxBLKob6jggGPMIIBizAfBgNVHSME\n" +
+            "GDAWgBTHYAPEqSYcmyk2U51uF7tzVkSmXjB6BggrBgEFBQcBAQRuMGwwRwYIKwYB\n" +
+            "BQUHMAKGO2h0dHA6Ly9yZXBvLmhhcmljYS5nci9jZXJ0cy9IYXJpY2FFQ0NDb2Rl\n" +
+            "U2lnbmluZ1N1YkNBUjIuY3J0MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5oYXJp\n" +
+            "Y2EuZ3IwYQYDVR0gBFowWDAIBgZngQwBBAEwCAYGBACPegEBMEIGDCsGAQQBgc8R\n" +
+            "AQMCATAyMDAGCCsGAQUFBwIBFiRodHRwczovL3JlcG8uaGFyaWNhLmdyL2RvY3Vt\n" +
+            "ZW50cy9DUFMwEwYDVR0lBAwwCgYIKwYBBQUHAwMwRQYDVR0fBD4wPDA6oDigNoY0\n" +
+            "aHR0cDovL2NybC5oYXJpY2EuZ3IvSGFyaWNhRUNDQ29kZVNpZ25pbmdTdWJDQVIy\n" +
+            "LmNybDAdBgNVHQ4EFgQUpNjChUi9LGgwz7E18N1EwXooEFcwDgYDVR0PAQH/BAQD\n" +
+            "AgeAMAoGCCqGSM49BAMDA2gAMGUCMQCDvQIjqgssTRHqp+gu7l21XmAQ4EMqr4+B\n" +
+            "05iU/edLxxV+z5roTswxnPnr43+EbvkCMHq4aFW1u1+RvPBQJNRnYmdXCnj0lUw4\n" +
+            "Ug7JnsEYMffLakDudzgsNv5ByJf9SO84Lw==\n" +
+            "-----END CERTIFICATE-----";
+
+    // Owner: CN=Greek Universities Network (GUnet), SERIALNUMBER=VATGR-099028220,
+    // OU=Class B - Private Key created and stored in software CSP, O=Greek Universities Network, L=Athens, C=GR
+    // Issuer: CN=HARICA Code Signing ECC SubCA R2, O=Hellenic Academic and Research Institutions Cert. Authority,
+    // L=Athens, C=GR
+    // Serial number: 4b14719c7195c96de8a5663724454205
+    // Valid from: Mon Feb 17 01:48:32 PST 2020 until: Mon Feb 15 16:00:00 PST 2021
+    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIEDjCCA5SgAwIBAgIQSxRxnHGVyW3opWY3JEVCBTAKBggqhkjOPQQDAzCBjzEL\n" +
+            "MAkGA1UEBhMCR1IxDzANBgNVBAcMBkF0aGVuczFEMEIGA1UECgw7SGVsbGVuaWMg\n" +
+            "QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3Jp\n" +
+            "dHkxKTAnBgNVBAMMIEhBUklDQSBDb2RlIFNpZ25pbmcgRUNDIFN1YkNBIFIyMB4X\n" +
+            "DTIwMDIxNzA5NDgzMloXDTIxMDIxNjAwMDAwMFowgc0xCzAJBgNVBAYTAkdSMQ8w\n" +
+            "DQYDVQQHDAZBdGhlbnMxIzAhBgNVBAoMGkdyZWVrIFVuaXZlcnNpdGllcyBOZXR3\n" +
+            "b3JrMUEwPwYDVQQLDDhDbGFzcyBCIC0gUHJpdmF0ZSBLZXkgY3JlYXRlZCBhbmQg\n" +
+            "c3RvcmVkIGluIHNvZnR3YXJlIENTUDEYMBYGA1UEBRMPVkFUR1ItMDk5MDI4MjIw\n" +
+            "MSswKQYDVQQDDCJHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMFkw\n" +
+            "EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECC+lD6hphUDLSGs/Vw4Tvj8RAuCQAyi+\n" +
+            "MUiXXXzGSp5e6ksBVlRlawluNR+BUtY93BRCjjNr3OuvSVALyrH7HKOCAZAwggGM\n" +
+            "MB8GA1UdIwQYMBaAFMdgA8SpJhybKTZTnW4Xu3NWRKZeMHoGCCsGAQUFBwEBBG4w\n" +
+            "bDBHBggrBgEFBQcwAoY7aHR0cDovL3JlcG8uaGFyaWNhLmdyL2NlcnRzL0hhcmlj\n" +
+            "YUVDQ0NvZGVTaWduaW5nU3ViQ0FSMi5jcnQwIQYIKwYBBQUHMAGGFWh0dHA6Ly9v\n" +
+            "Y3NwLmhhcmljYS5ncjBiBgNVHSAEWzBZMAgGBmeBDAEEATAIBgYEAI96AQEwQwYN\n" +
+            "KwYBBAGBzxEBAQMBATAyMDAGCCsGAQUFBwIBFiRodHRwczovL3JlcG8uaGFyaWNh\n" +
+            "LmdyL2RvY3VtZW50cy9DUFMwEwYDVR0lBAwwCgYIKwYBBQUHAwMwRQYDVR0fBD4w\n" +
+            "PDA6oDigNoY0aHR0cDovL2NybC5oYXJpY2EuZ3IvSGFyaWNhRUNDQ29kZVNpZ25p\n" +
+            "bmdTdWJDQVIyLmNybDAdBgNVHQ4EFgQUT4+WfQu125tLqla60vhK7ijBBWkwDgYD\n" +
+            "VR0PAQH/BAQDAgeAMAoGCCqGSM49BAMDA2gAMGUCMQDADGDAxKpUkyEKBLzpX+88\n" +
+            "ONLYDgFSie5W2ULWk02sDRO/k5xcSSjTf0FFa4+l6E8CME/b27e7NUGHPVYTLTWL\n" +
+            "5yPiboyNsT8QpV+hZiWh/Qqiw1E/bR2SPIGEwYUrOV61fA==\n" +
+            "-----END CERTIFICATE-----";
+
+    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
+        // Validate valid
+        pathValidator.validate(new String[]{VALID, INT},
+                ValidatePathWithParams.Status.GOOD, null, System.out);
+
+        // Validate Revoked
+        pathValidator.validate(new String[]{REVOKED, INT},
+                ValidatePathWithParams.Status.REVOKED,
+                "Mon Feb 17 02:00:57 PST 2020", System.out);
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/ProblemList.txt openjdk-8-8u312-b07/=unpacked-tar3=/test/ProblemList.txt
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/ProblemList.txt	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/ProblemList.txt	2021-09-01 14:33:15.000000000 +0000
@@ -387,8 +387,5 @@
 
 ############################################################################
 
-# 8141370
-com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java			linux-i586,macosx-all
-
 sample/mergesort/MergeSortTest.java				8178912 generic-all
 sample/chatserver/ChatTest.java					8178912 generic-all
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/java2d/GdiRendering/InsetClipping.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/java2d/GdiRendering/InsetClipping.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/java2d/GdiRendering/InsetClipping.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/java2d/GdiRendering/InsetClipping.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -29,7 +29,7 @@
  * clip shape.  This was a problem with our GDI renderer on Windows, where
  * we would ignore the window insets.
  * @run main InsetClipping
-*/
+ */
 
 /**
  * This test works by setting up a clip area that equals the visible area
@@ -42,10 +42,15 @@
  * test fails.
  */
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.geom.Area;
+import java.awt.image.BufferedImage;
 
 public class InsetClipping extends Frame {
     BufferedImage image;
@@ -78,6 +83,7 @@
     public static void main(String args[]) {
         InsetClipping clipTest = new InsetClipping();
         clipTest.setSize(300, 300);
+        clipTest.setLocationRelativeTo(null);
         clipTest.setVisible(true);
         while (!painted) {
             try {
@@ -101,12 +107,12 @@
             try {
                 Thread.sleep(2000);
             } catch (Exception e) {}
-            int pixelVal = clientPixels.getRGB(0, 0);
+            int pixelVal = clientPixels.getRGB(2, 2);
             clipTest.dispose();
             if ((new Color(pixelVal)).equals(fillColor)) {
                 System.out.println("Passed");
             } else {
-                throw new Error("Failed: incorrect color in pixel (0, 0)");
+                throw new Error("Failed: incorrect color in pixel (2, 2)");
             }
         } catch (Exception e) {
             System.out.println("Problems creating Robot");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java	2021-09-01 14:33:15.000000000 +0000
@@ -309,6 +309,7 @@
             String className = JavaProcess.class.getName();
             String classPath = System.getProperty("test.classes");
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UsePerfData",
                 "-Dtest.timeout.factor=" + System.getProperty("test.timeout.factor", "1.0"),
                 "-cp", classPath, className, mainArgsIdentifier);
             OutputBuffer ob = ProcessTools.getOutput(pb.start());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/net/www/ftptest/FtpCommandHandler.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/net/www/ftptest/FtpCommandHandler.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/net/www/ftptest/FtpCommandHandler.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/net/www/ftptest/FtpCommandHandler.java	2021-09-01 14:33:15.000000000 +0000
@@ -458,6 +458,10 @@
             try {
                 str = in.readLine();
                 System.out.println("line: " + str);
+                if (str == null) {
+                    System.out.println("EOF read from input");
+                    break;
+                }
                 buf = new StringBuffer(str);
                 res = parseCmd(buf);
                 switch (res) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy	2021-09-01 14:33:15.000000000 +0000
@@ -9,8 +9,7 @@
 grant {
 
     // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "java.home", "read";
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/krb5/auto/ReferralsTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/krb5/auto/ReferralsTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/krb5/auto/ReferralsTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/krb5/auto/ReferralsTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Red Hat, Inc.
+ * Copyright (c) 2019, 2021, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -286,6 +286,16 @@
      * on different realms.
      */
     private static void testImpersonation() throws Exception {
+        testImpersonationSingle();
+
+        // Try a second time to force the use of the Referrals Cache.
+        // During this execution, the referral ticket from RABBIT.HOLE
+        // to DEV.RABBIT.HOLE (upon the initial S4U2Self message) will
+        // be obtained from the Cache.
+        testImpersonationSingle();
+    }
+
+    private static void testImpersonationSingle() throws Exception {
         Context s = Context.fromUserPass(serviceKDC2Name, password, true);
         s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
         GSSName impName = s.impersonate(userKDC1Name).cred().getName();
@@ -305,6 +315,16 @@
      * because the server and the backend are on different realms.
      */
     private static void testDelegationWithReferrals() throws Exception {
+        testDelegationWithReferralsSingle();
+
+        // Try a second time to force the use of the Referrals Cache.
+        // During this execution, the referral ticket from RABBIT.HOLE
+        // to DEV.RABBIT.HOLE (upon the initial S4U2Proxy message) will
+        // be obtained from the Cache.
+        testDelegationWithReferralsSingle();
+    }
+
+    private static void testDelegationWithReferralsSingle() throws Exception {
         Context c = Context.fromUserPass(userKDC1Name, password, false);
         c.startAsClient(serviceName, GSSUtil.GSS_KRB5_MECH_OID);
         Context s = Context.fromUserPass(serviceKDC2Name, password, true);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/lib/cacerts/VerifyCACerts.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/lib/cacerts/VerifyCACerts.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/lib/cacerts/VerifyCACerts.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/lib/cacerts/VerifyCACerts.java	2021-09-01 14:33:15.000000000 +0000
@@ -27,7 +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 8259312
+ *      8225072 8258630 8259312 8243559 8256421 8225081
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -53,12 +53,12 @@
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 97;
+    private static final int COUNT = 91;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "9F:6B:41:1D:05:AF:E3:C5:4F:E8:39:89:50:79:60:B1:F6:A4:02:40:0C:28:8D:73:78:08:E5:61:7C:17:EA:59";
+            = "9B:C3:0B:24:D4:26:E4:A9:4F:2C:96:25:06:9B:08:E5:13:5B:0B:33:74:5F:78:DB:BD:91:CD:31:D4:37:07:28";
 
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
@@ -133,16 +133,6 @@
                     "A4:31:0D:50:AF:18:A6:44:71:90:37:2A:86:AF:AF:8B:95:1F:FB:43:1D:83:7F:1E:56:88:B4:59:71:ED:15:57");
             put("thawteprimaryrootcag3 [jdk]",
                     "4B:03:F4:58:07:AD:70:F2:1B:FC:2C:AE:71:C9:FD:E4:60:4C:06:4C:F5:FF:B6:86:BA:E5:DB:AA:D7:FD:D3:4C");
-            put("thawtepremiumserverca [jdk]",
-                    "3F:9F:27:D5:83:20:4B:9E:09:C8:A3:D2:06:6C:4B:57:D3:A2:47:9C:36:93:65:08:80:50:56:98:10:5D:BC:E9");
-            put("verisigntsaca [jdk]",
-                    "CB:6B:05:D9:E8:E5:7C:D8:82:B1:0B:4D:B7:0D:E4:BB:1D:E4:2B:A4:8A:7B:D0:31:8B:63:5B:F6:E7:78:1A:9D");
-            put("verisignclass2g2ca [jdk]",
-                    "3A:43:E2:20:FE:7F:3E:A9:65:3D:1E:21:74:2E:AC:2B:75:C2:0F:D8:98:03:05:BC:50:2C:AF:8C:2D:9B:41:A1");
-            put("verisignclass3ca [jdk]",
-                    "A4:B6:B3:99:6F:C2:F3:06:B3:FD:86:81:BD:63:41:3D:8C:50:09:CC:4F:A3:29:C2:CC:F0:E2:FA:1B:14:03:05");
-            put("verisignclass3g2ca [jdk]",
-                    "83:CE:3C:12:29:68:8A:59:3D:48:5F:81:97:3C:0F:91:95:43:1E:DA:37:CC:5E:36:43:0E:79:C7:A8:88:63:8B");
             put("verisignuniversalrootca [jdk]",
                     "23:99:56:11:27:A5:71:25:DE:8C:EF:EA:61:0D:DF:2F:A0:78:B5:C8:06:7F:4E:82:82:90:BF:B8:60:E8:4B:3C");
             put("verisignclass3g3ca [jdk]",
@@ -187,8 +177,6 @@
                     "3B:22:2E:56:67:11:E9:92:30:0D:C0:B1:5A:B9:47:3D:AF:DE:F8:C8:4D:0C:EF:7D:33:17:B4:C1:82:1D:14:36");
             put("swisssignsilverg2ca [jdk]",
                     "BE:6C:4D:A2:BB:B9:BA:59:B6:F3:93:97:68:37:42:46:C3:C0:05:99:3F:A9:8F:02:0D:1D:ED:BE:D4:8A:81:D5");
-            put("soneraclass2ca [jdk]",
-                    "79:08:B4:03:14:C1:38:10:0B:51:8D:07:35:80:7F:FB:FC:F8:51:8A:00:95:33:71:05:BA:38:6B:15:3D:D9:27");
             put("securetrustca [jdk]",
                     "F1:C1:B5:0A:E5:A2:0D:D8:03:0E:C9:F6:BC:24:82:3D:D3:67:B5:25:57:59:B4:E7:1B:61:FC:E9:F7:37:5D:73");
             put("xrampglobalca [jdk]",
@@ -273,16 +261,12 @@
             add("addtrustexternalca [jdk]");
             // Valid until: Sat May 30 10:44:50 GMT 2020
             add("addtrustqualifiedca [jdk]");
-            // Valid until: Fri Jan 01 15:59:59 PST 2021
-            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]");
-            // Valid until: Tue Apr 06 00:29:40 PDT 2021
-            add("soneraclass2ca [jdk]");
+            // Valid until: Thu Sep 30 14:01:15 GMT 2021
+            add("identrustdstx3 [jdk]");
         }
     };
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/EncryptionPadding.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/EncryptionPadding.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/EncryptionPadding.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/EncryptionPadding.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8261355
+ * @library ..
+ * @run main/othervm EncryptionPadding
+ */
+
+import java.nio.ByteBuffer;
+import java.security.Key;
+import java.security.Provider;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+public class EncryptionPadding extends PKCS11Test {
+
+    private static String transformation = "AES/ECB/PKCS5Padding";
+    private static Key key = new SecretKeySpec(new byte[16], "AES");
+
+    public static void main(String[] args) throws Exception {
+        main(new EncryptionPadding(), args);
+    }
+
+    @Override
+    public void main(Provider p) throws Exception {
+        testWithInputSize(p, 1);
+        testWithInputSize(p, 15);
+        testWithInputSize(p, 16);
+        testWithInputSize(p, 17);
+        System.out.println("TEST PASS - OK");
+    }
+
+    private static void testWithInputSize(Provider p, int inputSize)
+            throws Exception {
+        testWithInputSize(p, inputSize, false);
+        testWithInputSize(p, inputSize, true);
+    }
+
+    private static void testWithInputSize(Provider p, int inputSize,
+            boolean isByteBuffer) throws Exception {
+        byte[] plainText = new byte[inputSize];
+        Arrays.fill(plainText, (byte)(inputSize & 0xFF));
+        ByteBuffer cipherText =
+                ByteBuffer.allocate(((inputSize / 16 ) + 1) * 16);
+        byte[] tmp;
+
+        Cipher sunPKCS11cipher = Cipher.getInstance(transformation, p);
+        sunPKCS11cipher.init(Cipher.ENCRYPT_MODE, key);
+        for (int i = 0; i < ((inputSize - 1) / 16) + 1; i++) {
+            int updateLength = Math.min(inputSize - (16 * i), 16);
+            if (!isByteBuffer) {
+                tmp = sunPKCS11cipher.update(plainText, i * 16,
+                        updateLength);
+                if (tmp != null) {
+                    cipherText.put(tmp);
+                }
+            } else {
+                ByteBuffer bb = ByteBuffer.allocate(updateLength);
+                bb.put(plainText, i * 16, updateLength);
+                bb.flip();
+                sunPKCS11cipher.update(bb, cipherText);
+            }
+        }
+        if (!isByteBuffer) {
+            tmp = sunPKCS11cipher.doFinal();
+            if (tmp != null) {
+                cipherText.put(tmp);
+            }
+        } else {
+            sunPKCS11cipher.doFinal(ByteBuffer.allocate(0), cipherText);
+        }
+
+        Cipher sunJCECipher = Cipher.getInstance(transformation, "SunJCE");
+        sunJCECipher.init(Cipher.DECRYPT_MODE, key);
+        byte[] sunJCEPlain = sunJCECipher.doFinal(cipherText.array());
+
+        if (!Arrays.equals(plainText, sunJCEPlain)) {
+            throw new Exception("Cross-provider cipher test failed.");
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/TestGCMKeyAndIvCheck.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/TestGCMKeyAndIvCheck.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/TestGCMKeyAndIvCheck.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs11/Cipher/TestGCMKeyAndIvCheck.java	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8080462
+ * @bug 8080462 8229243
  * @library ..
  * @modules jdk.crypto.cryptoki
  * @run main TestGCMKeyAndIvCheck
@@ -81,6 +81,7 @@
                     ", no support for " + mode);
             return;
         }
+        System.out.println("Testing against " + p.getName());
         SecretKey key = new SecretKeySpec(new byte[16], "AES");
         // First try parameter-less init.
         c.init(Cipher.ENCRYPT_MODE, key);
@@ -111,12 +112,11 @@
             throw new Exception("Parameters contains incorrect IV value");
         }
 
-        // Should be ok to use the same key+iv for decryption
         c.init(Cipher.DECRYPT_MODE, key, params);
         c.updateAAD(AAD);
         byte[] recovered = c.doFinal(ctPlusTag);
         if (!Arrays.equals(recovered, PT)) {
-            throw new Exception("decryption result mismatch");
+            throw new Exception("Decryption result mismatch");
         }
 
         // Now try to encrypt again using the same key+iv; should fail also
@@ -125,6 +125,7 @@
             throw new Exception("Should throw exception when same key+iv is used");
         } catch (InvalidAlgorithmParameterException iape) {
             // expected
+            System.out.println("Expected IAPE thrown");
         }
 
         // Now try to encrypt again using parameter-less init; should work
@@ -138,7 +139,8 @@
         }
 
         // Now try to encrypt again using a different parameter; should work
-        AlgorithmParameterSpec spec2 = new GCMParameterSpec(128, new byte[30]);
+        AlgorithmParameterSpec spec2 = new GCMParameterSpec(128,
+            "Solaris PKCS11 lib does not allow all-zero IV".getBytes());
         c.init(Cipher.ENCRYPT_MODE, key, spec2);
         c.updateAAD(AAD);
         c.doFinal(PT);
@@ -154,7 +156,7 @@
         c.updateAAD(AAD);
         recovered = c.doFinal(ctPlusTag);
         if (!Arrays.equals(recovered, PT)) {
-            throw new Exception("decryption result mismatch");
+            throw new Exception("Decryption result mismatch");
         }
 
         // Now try decryption again and re-init using the same parameters
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/EmptyPassword.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/EmptyPassword.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/EmptyPassword.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/EmptyPassword.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8202299
+ * @modules java.base/sun.security.tools.keytool
+ *          java.base/sun.security.x509
+ * @library /lib /
+ * @summary Java Keystore fails to load PKCS12/PFX certificates created in WindowsServer2016
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.X500Name;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+
+public class EmptyPassword {
+
+    public static void main(String[] args) throws Exception {
+
+        // KeyStore is protected with password "\0".
+        CertAndKeyGen gen = new CertAndKeyGen("RSA", "SHA256withRSA");
+        gen.generate(2048);
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        ks.load(null, null);
+        ks.setKeyEntry("a", gen.getPrivateKey(), new char[1],
+                new Certificate[] {
+                        gen.getSelfCertificate(new X500Name("CN=Me"), 100)
+                });
+        try (FileOutputStream fos = new FileOutputStream("p12")) {
+            ks.store(fos, new char[1]);
+        }
+
+        // It can be loaded with password "".
+        try (FileInputStream inStream = new FileInputStream("p12")) {
+            ks.load(inStream, new char[0]);
+        }
+        Asserts.assertTrue(ks.getKey("a", new char[0]) != null);
+        Asserts.assertTrue(ks.getCertificate("a") != null);
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/PBES2Encoding.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/PBES2Encoding.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/PBES2Encoding.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/PBES2Encoding.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8202837
+ * @summary PBES2 AlgorithmId encoding error in PKCS12 KeyStore
+ */
+
+import java.io.ByteArrayInputStream;
+import java.security.KeyStore;
+
+public class PBES2Encoding {
+
+    // This is a PKCS 12 file using PBES2 to encrypt the cert and key. It is
+    // generated with these commands:
+    //
+    // keytool -keystore ks -genkeypair -storepass changeit -alias a -dname CN=A
+    // openssl pkcs12 -in ks -nodes -out kandc -passin pass:changeit
+    // openssl pkcs12 -export -in kandc -out p12 -name a -passout pass:changeit
+    //         -certpbe AES-128-CBC -keypbe AES-128-CBC
+
+    static final String P12_FILE =
+            "308208860201033082084c06092a864886f70d010701a082083d048208393082" +
+            "08353082050406092a864886f70d010706a08204f5308204f1020100308204ea" +
+            "06092a864886f70d010701304906092a864886f70d01050d303c301b06092a86" +
+            "4886f70d01050c300e040879e103dcdf95bd3e02020800301d06096086480165" +
+            "0304010204108afe09885014c1315a431956bf051cd1808204909af1a5964e45" +
+            "fa24887c963d422500a54576bda5b79beba0a97ec61fd7f68e1d7acca9c7a2ff" +
+            "fa90cc161d1e930a8315158089ce5e842ae758f63d723bd02b82120e663c2965" +
+            "a32101d27f268f7101d9b8786ddeeb8ddfa57d63c7b110ad9015b6279f8c5adf" +
+            "d2a78f82d6641bbb4c363bfe6d5be78993c54a1a52d83acba21f70a70c104c18" +
+            "1968df3009896fb3af534661a8a3d25a09974adfd6dd587f067fd5a2017f0d34" +
+            "99ca0dfd9950f555e950ceb3120408fb9b72e3b43020e4cde2f1c7726901328d" +
+            "78471d7825ce6c9968d9f8e3ae2f2963cfc7d81bd1facfa55f56d711f3568673" +
+            "6c75bc6ae67beee1a70355bf1daa17aba7cdc4fe35b06881503b7a99d1c3efeb" +
+            "e036217042e2f7918c038dc5505447acbe84db6ac10527dd65597b25c8d5f68a" +
+            "349ca4da866b76934aa7c1f4c452b6c45bd97d991c35d3ce63e20342817f7874" +
+            "40d73d2b3329aafba3c95ed2601d2fc85231f0f1797f7e36ae4ff379af030a09" +
+            "1d9c476468eff8be50632c706f0308a5e3a307a1929241b8fcd4fef447c6606b" +
+            "7c45cc01c3dae196b54479d453428c378ec9cdbd45ff514793a91d61d0b230ff" +
+            "4af62765773e9b51ef2f5965c046b25e7c09b42838b2a19fe5262756a64e7b96" +
+            "6fa0159f369d6afb9f4486e2cc7e56a9b9d5afdd28e8c0e19ff4cdf2f7904a12" +
+            "8284201f51dbdfb3fffb2d482764226c8bee83190d99e6bd0bf310eab5501922" +
+            "aede091d3ee8fc405874a63fc696c577829192c65b70964bf54db87c77fe823b" +
+            "19a8344275142387926909c39c0008d9111c78d7e296ba74ca448010db327e11" +
+            "0927fe2029a5fcfde66d6883a26bab78e3dfdb9569a64d117b26e04d627b35b7" +
+            "3a795eb9e6ea7bd4469403cb8a822831c71bc587d3b81b0ae4ca381df8b6872c" +
+            "8bea5f8c99be643f34bafe5bac178c5a36a4c8088e0535eda0511326e3b0ae5e" +
+            "dafde080886fa539f659525d3fcd38468e8c00c05d223d6bd060ef875894f7bc" +
+            "63e61854fad5f6146959d0447a4714a3b79292890ae52c7aa82075f56386e3d3" +
+            "fa2d3376156dc2f5811bd1ac2ca97cb1068a22577513e68a7a0116c6268f9146" +
+            "a718c9e11dad701f3562be8cb9beb3aadd2003b32e3d88afbf178f7a7b5daf09" +
+            "f5acaad1fe0dd27d7094a522a39ede71e621dc2b25b4e855d9a1853cdfa5f6f7" +
+            "b4a0e1c7a5eacd4903aef9eae6a1c2df370137830bcf5cae2e96eef2d9934e9d" +
+            "21e756499370cba32dc923f26915864b2a3cd5b046fad05922ff686f8ccb0b2b" +
+            "4bce27d4c91a0c4d3fab3fd65eb0327d2435c27bdd789b66cb88fe56c31b1785" +
+            "b8820a7c07947f3bf0d6d18ab2d334d927a70dad2fcdad31422138bb3ef39a3d" +
+            "0e66c298e66d38efad20a8e963b98a59e8b6c5d92aea4364c5f720ea9ab6f510" +
+            "2c5ccad50bcb3b5d3fe1ae2810118af0339a6b980c3e2ff1014675ef3a8ea84c" +
+            "3a27b18a088979cddaee68cb65761fdeafc1ab766c13ca8c073cadedec3bf7c0" +
+            "bdc2e91dcbb1295100a3d66838992a19049a7c25ad683c55ed9831cf187dfdba" +
+            "242c38a9a32b9d023753c31519987f43d57a02b238230e93f8c5f5ab64516ece" +
+            "eb915dda45ceb7257e87c909a381248a809b30202884b26eac08b53f9de2478f" +
+            "3b0b410698e44744fbe63082032906092a864886f70d010701a082031a048203" +
+            "16308203123082030e060b2a864886f70d010c0a0102a08202c3308202bf3049" +
+            "06092a864886f70d01050d303c301b06092a864886f70d01050c300e040875ea" +
+            "e60a1bd8525102020800301d060960864801650304010204101c066ab644ec44" +
+            "506b2accab7458b77f04820270c4f2702354ebcd5eb1bfb82bd22382035a7907" +
+            "ab5af91d045250ac1d56f95e4b0d944a99bccd266ea4f7402e5c2082f70ac8ff" +
+            "081242bbd0e9b374eedcafbca01983ca9e324d8850cad4ac43396b1a3250e365" +
+            "fa01e3882d19a01f017724a90242d0558d75399cf310ac551cd60d92e26bc8b2" +
+            "7872882b1f41819d1f660f18a0a2825bd81c861e02124c586046a3609f36713b" +
+            "dcefdc617788032d13268dfb6530205757aba368950041830cbd07ad3ef3987a" +
+            "5d71c1cf9987be05de696b4191a44f405227c89fc857dfbf956fe0ab1a0d8c02" +
+            "613773b1234acd9d3c75994ea00883c1686e3e57661d9937c1837770b3dd2874" +
+            "0ccfcff02d1998cb9907a78b9d95475542cd3e064231f40e425a745dbc5cfec8" +
+            "30f7b6e935487e68b664d998ddfaa06db44c247a0f012f17099c8bb955827e13" +
+            "5017b2526bee9a222e70933f6d7b8968dffe4ca033022d4eac85259434d68e89" +
+            "43d3c9e4c516ec88bb81971d6751803aef4afdb01505f81f8f71d3c074ab788f" +
+            "7a5d197c3985488b6acc53c23bef91906f3009c6ec199cc916fcb88876a28727" +
+            "32ee95d59f636d78e597e10a0e305bd1a5ccda8ad9716f0b5e9c8ca9bfa9ee54" +
+            "224c1183d499d063c6c1ec02b7f9a482b8983bcbad6b64eefc77ef961ec4dd02" +
+            "1f832e3c048b9f77034bbd896b7ab13a9f22d7fe94c88626e77b7c0b2d9fac44" +
+            "914bd9c50cc69ef58044ae1cc423eb321bf5ce2c7505df45d21b932c675c0c5b" +
+            "3705328245bc70ac262808519681f94489912a3dea891aab2d3bdc573b6b17cf" +
+            "6bfd8c1a93404a91efaca5441cd2192b71529a543938056382a7f54fabea4760" +
+            "6ef9ea7c8cdd663036e528ae6043ff138354b43b85cf488f3748fb1051313830" +
+            "1106092a864886f70d01091431041e020061302306092a864886f70d01091531" +
+            "160414664fad18d5583599e1cbe7fe694f36237e2272c530313021300906052b" +
+            "0e03021a0500041472658e404aba0df42263cff430397794c379977504084962" +
+            "aeaf211dfa1f02020800";
+
+    public static void main(String[] args) throws Exception {
+
+        byte[] p12 = new byte[P12_FILE.length() / 2];
+        for (int i = 0; i < p12.length; i++) {
+            p12[i] = Integer.valueOf(P12_FILE.substring(2 * i, 2 * i + 2), 16)
+                    .byteValue();
+        }
+
+        KeyStore ks = KeyStore.getInstance("pkcs12");
+        ks.load(new ByteArrayInputStream(p12), "changeit".toCharArray());
+
+        // Make sure both cert and key can be retrieved
+        System.out.println(ks.getCertificate("a"));
+        System.out.println(ks.getKey("a", "changeit".toCharArray()));
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/WrongPBES2.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/WrongPBES2.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/pkcs12/WrongPBES2.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/pkcs12/WrongPBES2.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8214513
+ * @summary A PKCS12 keystore from Java 8 using custom PBE parameters cannot be read in Java 11
+ */
+
+import javax.crypto.spec.PBEParameterSpec;
+import java.io.*;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+
+public class WrongPBES2 {
+
+    private static final char[] PASS = "changeit".toCharArray();
+
+    // This is a PKCS 12 file using PBES2 with an incorrect encoding before
+    // JDK-8202837 is fixed. It is generated with these 2 commands:
+    //
+    // keytool -genkeypair -alias a -dname CN=A -keystore ks -storepass changeit
+    // $JDK10/bin/java WrongPBES2 reenc
+    static final String P12_FILE =
+            "308208940201033082084d06092a864886f70d010701a082083e0482083a3082" +
+            "08363082035206092a864886f70d010701a08203430482033f3082033b308203" +
+            "37060b2a864886f70d010c0a0102a08202ee308202ea307406092a864886f70d" +
+            "01050d306706092a864886f70d01050d305a303906092a864886f70d01050c30" +
+            "2c0414000000000000000000000000000000000000000002030186a002012030" +
+            "0c06082a864886f70d020b0500301d060960864801650304012a04105abc352d" +
+            "35d98fd77d8c8cf205d690c6048202703ff97bd4488a6a5569993fb6f89792e7" +
+            "33632b20fdc502bf0801c8ee80683d064c4dae5b8880ade893a87bfdb4427dfd" +
+            "01bc5656fdb50f45f1e8d60b37416d2f3b1be9e8ae145bfe035f9d947fa49a31" +
+            "baef86dec6780a0f96a7ad5d9ef850b15f56d6b6f2f0798c190b01b42d955d36" +
+            "96f1416efb0c246b56e3715c1ccef701f975f6faf7e7640b8edca79f996682d8" +
+            "5a414c8210004f247058c3362f328c12d024ea88de5ab3d6c50a7cf8f32b69de" +
+            "999930ccb29be0d278216db0959d9b142e4c46207edaf91f37708e0250e99262" +
+            "c4acba4b83c2c0affb3bfc2d5bfe210baffe56ba1f667c9e3c33e0c4164d0c16" +
+            "abc89bca2c1af7fc234163a6a17e4852ee08053bdf699c8659ea57f77427ab3b" +
+            "cea357a85ffd80589403bc73ff50490f9b0bfb37fedf495aae8ef8a00da7d1e1" +
+            "62c49dacf82503e803953f48e302d1ae1b7e7870a479c7861ffc236469807f31" +
+            "da0b15a915a62d4f0a42698a4c9779595619effa04765f91342821229752ec6d" +
+            "6e0657ad4e41979847b5903ddb6a6819b859797a2f663898694fe294cc85b9c3" +
+            "d485516659dcd6d89f631903be35367315b131f9f5ec63ee5bf25f3afcf8bc9c" +
+            "d9056a56f951746664cfa3ed0596e005fda6fb753d9c67c92fd1a9f22d06a59e" +
+            "9c7af058dddad3b9265fc29c18122f55c07a1780050251990c221ba2b3767586" +
+            "405def7a1b224135ac4a694f0e3d27666486531aad9e27a3855f54e2916a642a" +
+            "ed06fc5275b675bbf457a26978b0f4306c166119dedc3aedf366cbf34efa647e" +
+            "a65b8451c7b1d083fe1ee3a8493a0330ee7da68552614e50ca7326a25d741e40" +
+            "ccac2149d1ff5cb8778a3b08ed3d9a1774c971525454b7c20b18610b9bc847cc" +
+            "3136301106092a864886f70d01091431041e020061302106092a864886f70d01" +
+            "09153114041254696d652031353433363738383539323632308204dc06092a86" +
+            "4886f70d010706a08204cd308204c9020100308204c206092a864886f70d0107" +
+            "013029060a2a864886f70d010c0106301b0414e6d3162d3b75f103fac6ea3fbf" +
+            "96d08c0225d308020300c3508082048834d05f8953cad673f7de3b5446bcdd31" +
+            "310b376eec04c393f1077cfda8ad69fe0133cf79fbdd204eeca165e1d6e288b9" +
+            "a6625dfe34aa722f230c50da44d463753d3bbd7e762cb0f164b7fbfe4a3aff8c" +
+            "dc664ef2c6afd01232de66d81221e977738b81838cadd0fe1f87bdd7278dcdbd" +
+            "2307bda516e931691e3da46f82f72073ab6502b9f2b23788c620756eedddf21e" +
+            "705a6043d29a8e27285fea79e4a9966f5b08d5f13bc6f4d854f47879ee90e72d" +
+            "3a5cc6eccda9edf60c4d73edf3e4dd6c715c06c53e83ba461e10868e5ef5e218" +
+            "726bc6714f3071b3f17a075ff9d28d2cb48896b785d48551e8410f2bc882ad04" +
+            "88d60c85c3b966e1b484e4190267b38e3179107f3c49abd2b058fb32eab4abfc" +
+            "ee914ee4407954e1edb338042ca04b1561df364139a64a1080c79bfdfa17d15b" +
+            "6fc26b0572427b2f1b9bbea6d1a730a7dd1b08d22093658f9a5665ae8e9a04b8" +
+            "af89a60ea7994d17949b22e2fc6d5d4dd1d280283fd649e1aca6e0e4c90ae509" +
+            "afc01bd92127321798562cf5ba75fed840f8ca9082c8c58334a95593fa5b1b57" +
+            "ea86cb8452136dee7ecd63872d4848d9052e181f6bca0772a4d4dd43817b9005" +
+            "a6314cbd90474a24b6ed9c9896097bba51ca7cd48120b5f9fee3f98dd99bbcd3" +
+            "e0ab43bcbb922bcf48cf710f7a5b9d192f419f607b6ca7937d8ed6f990835b88" +
+            "7f480cc5fad2708c57c674d0e082af60d8b0108df2bf88b321df4d0431d4dfc0" +
+            "4ae21cfd5446715e4af6bcb2224a8d6dc26d71806f21c1e17e8dd2ac57632234" +
+            "1d3e72cbcce4c4e59421fc5202ec6d76c623b81a872ab6b8d53e4215234ee8d9" +
+            "61148b0f42300fc0c89ec91f528698d79a27af593e5fd56484c97763ebc4a797" +
+            "13511ec0e13c59318d1ac444f6121a81a4f505b7e3dca70d6cd74b209fc10003" +
+            "78d5f2016c63acd019a1175e41fe60b88ff5e7238b32ef25243da462cabcd6c7" +
+            "5789c6055ef4999522acb386138f085e9bc2e9b41ecaf3bbb0990ac8b9efde0e" +
+            "eedff4c636bd13ef2dc18bfe5e900d88f4649ce326bc4f8e9bfe058832a595e3" +
+            "5c65415ca9606b0d2c705519eb83995a6da302f53e57a93f2be20dc858d3d5e9" +
+            "e8fdbc10af092b47c108d2e44eed00879626389b35df014e54ea3bf067d2d800" +
+            "b74f67c3576d585e6fedf9634e1ae7941d0de0faed7c76e0296d701728792bf4" +
+            "9bf007738d9273af8981bd71ed4a6360c08a4c5ab83ee337141c37679cf5db7a" +
+            "5aff7353ed6285bab948cac12559ee6ed9f34ee20e01b538975e26c310a33790" +
+            "f8be9fbb907f2585f55d2a456c6be4e46e08edd3aa5392d1c9415a6ded826776" +
+            "b04a3804f9b5f078888320ee5b279a4bba3b5c73ae1e8444b9320b92eb6b8e16" +
+            "75f505bcf79ff0e0cc80326e9bedbc6baebce47725aef3914e4326b924984788" +
+            "1d21d59d71b08ba34283f5784deeeecb9f4a3cfbcb21e48e8a9a94972ee7366e" +
+            "04d1d9c60534fdb7bfe5ec559427b6bbe96d41f551dde0800684226920cbc4f4" +
+            "1f3a7225e0c6a15d3ebee4e87ae4c40fef4d2e5272bb5b0037030665ae1faba7" +
+            "4c41a04277bbe1851e090c8d31e48575bbc96618e3cfeea5a2f80fc1e565adc8" +
+            "ffd84b803877ff9b305a4da59e6f707b3dbe95f7c037fbec303e302130090605" +
+            "2b0e03021a05000414adb4dd32f3ce248ec62e2fd45835255c2316739e041441" +
+            "f87d07019980ef69b635f06017567e36aa3d8802030186a0";
+
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0 && args[0].equals("reenc")) {
+            reEncodeWithPBES2();
+        } else {
+            test();
+        }
+    }
+
+    private static void test() throws Exception {
+        byte[] p12 = new byte[P12_FILE.length() / 2];
+        for (int i = 0; i < p12.length; i++) {
+            p12[i] = Integer.valueOf(P12_FILE.substring(2 * i, 2 * i + 2), 16)
+                    .byteValue();
+        }
+        KeyStore ks = KeyStore.getInstance("pkcs12");
+        ks.load(new ByteArrayInputStream(p12), PASS);
+        System.out.println(ks.getKey("a", PASS));
+    }
+
+    private static void reEncodeWithPBES2() throws Exception {
+        KeyStore keyStore = KeyStore.getInstance("pkcs12");
+        try (FileInputStream fis = new FileInputStream("ks")) {
+            keyStore.load(fis, PASS);
+        }
+
+        KeyStore.PrivateKeyEntry privateKeyEntry = new KeyStore.PrivateKeyEntry(
+                (PrivateKey)keyStore.getKey("a", PASS),
+                new Certificate[] { keyStore.getCertificate("a") });
+        keyStore.setEntry("a", privateKeyEntry, new KeyStore.PasswordProtection(
+                PASS, "PBEWithHmacSHA512AndAES_256",
+                new PBEParameterSpec(new byte[20], 100_000)));
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        keyStore.store(bout, PASS);
+        byte[] p12 = bout.toByteArray();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < p12.length; i++) {
+            if (i % 32 == 0) {
+                if (i != 0) {
+                    sb.append("\" +\n");
+                }
+                sb.append("\"");
+            }
+            sb.append(String.format("%02x", p12[i] & 0xff));
+        }
+        sb.append("\";\n");
+        System.out.println(sb.toString());
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/ALPN/AlpnGreaseTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/ALPN/AlpnGreaseTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/ALPN/AlpnGreaseTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/ALPN/AlpnGreaseTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8254631
+ * @summary Better support ALPN byte wire values in SunJSSE
+ * @library /javax/net/ssl/templates
+ * @run main/othervm AlpnGreaseTest
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+/**
+ * A SSLEngine usage example which simplifies the presentation
+ * by removing the I/O and multi-threading concerns.
+ *
+ * The test creates two SSLEngines, simulating a client and server.
+ * The "transport" layer consists two byte buffers:  think of them
+ * as directly connected pipes.
+ *
+ * Note, this is a *very* simple example: real code will be much more
+ * involved.  For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced.
+ */
+public class AlpnGreaseTest implements SSLContextTemplate {
+
+    private final SSLEngine clientEngine;     // client Engine
+    private final ByteBuffer clientOut;       // write side of clientEngine
+    private final ByteBuffer clientIn;        // read side of clientEngine
+
+    private final SSLEngine serverEngine;     // server Engine
+    private final ByteBuffer serverOut;       // write side of serverEngine
+    private final ByteBuffer serverIn;        // read side of serverEngine
+
+    // For data transport, this example uses local ByteBuffers.  This
+    // isn't really useful, but the purpose of this example is to show
+    // SSLEngine concepts, not how to do network transport.
+    private final ByteBuffer cTOs;      // "reliable" transport client->server
+    private final ByteBuffer sTOc;      // "reliable" transport server->client
+
+    // These are the various 8-bit char values that could be sent as GREASE
+    // values.  We'll just make one big String here to make it easy to check
+    // that the right values are being output.
+    private static final byte[] greaseBytes = new byte[] {
+        (byte) 0x0A, (byte) 0x1A, (byte) 0x2A, (byte) 0x3A,
+        (byte) 0x4A, (byte) 0x5A, (byte) 0x6A, (byte) 0x7A,
+        (byte) 0x8A, (byte) 0x9A, (byte) 0xAA, (byte) 0xBA,
+        (byte) 0xCA, (byte) 0xDA, (byte) 0xEA, (byte) 0xFA
+    };
+
+    private static final String greaseString =
+            new String(greaseBytes, StandardCharsets.ISO_8859_1);
+
+    private static void findGreaseInClientHello(byte[] bytes) throws Exception {
+        for (int i = 0; i < bytes.length - greaseBytes.length; i++) {
+            if (findGreaseInArray(bytes, i)) {
+                System.out.println("Found greaseBytes in ClientHello at: " + i);
+                return;
+            }
+        }
+        throw new Exception("Couldn't find greaseBytes");
+    }
+
+    private static boolean findGreaseInArray(byte[] bytes, int startOff) {
+        for (int i = 0; i < greaseBytes.length; i++) {
+            if (bytes[startOff + i] != greaseBytes[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private AlpnGreaseTest() throws Exception {
+        serverEngine = configureServerEngine(
+                createServerSSLContext().createSSLEngine());
+
+        clientEngine = configureClientEngine(
+                createClientSSLContext().createSSLEngine());
+
+        // We'll assume the buffer sizes are the same
+        // between client and server.
+        SSLSession session = clientEngine.getSession();
+        int appBufferMax = session.getApplicationBufferSize();
+        int netBufferMax = session.getPacketBufferSize();
+
+        // We'll make the input buffers a bit bigger than the max needed
+        // size, so that unwrap()s following a successful data transfer
+        // won't generate BUFFER_OVERFLOWS.
+        //
+        // We'll use a mix of direct and indirect ByteBuffers for
+        // tutorial purposes only.  In reality, only use direct
+        // ByteBuffers when they give a clear performance enhancement.
+        clientIn = ByteBuffer.allocate(appBufferMax + 50);
+        serverIn = ByteBuffer.allocate(appBufferMax + 50);
+
+        cTOs = ByteBuffer.allocateDirect(netBufferMax);
+        sTOc = ByteBuffer.allocateDirect(netBufferMax);
+
+        clientOut = ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
+        serverOut = ByteBuffer.wrap("Hello Client, I'm Server".getBytes());
+    }
+
+    //
+    // Protected methods could be used to customize the test case.
+    //
+
+    /*
+     * Configure the client side engine.
+     */
+    protected SSLEngine configureClientEngine(SSLEngine clientEngine) {
+        clientEngine.setUseClientMode(true);
+
+        // Get/set parameters if needed
+        SSLParameters paramsClient = clientEngine.getSSLParameters();
+        paramsClient.setApplicationProtocols(new String[] { greaseString });
+
+        clientEngine.setSSLParameters(paramsClient);
+
+        return clientEngine;
+    }
+
+    /*
+     * Configure the server side engine.
+     */
+    protected SSLEngine configureServerEngine(SSLEngine serverEngine) {
+        serverEngine.setUseClientMode(false);
+        serverEngine.setNeedClientAuth(true);
+
+        // Get/set parameters if needed
+        //
+        SSLParameters paramsServer = serverEngine.getSSLParameters();
+        paramsServer.setApplicationProtocols(new String[] { greaseString });
+        serverEngine.setSSLParameters(paramsServer);
+
+        return serverEngine;
+    }
+
+    public static void main(String[] args) throws Exception {
+        new AlpnGreaseTest().runTest();
+    }
+
+    //
+    // Private methods that used to build the common part of the test.
+    //
+
+    private void runTest() throws Exception {
+        SSLEngineResult clientResult;
+        SSLEngineResult serverResult;
+
+        boolean dataDone = false;
+        boolean firstClientWrap = true;
+        while (isOpen(clientEngine) || isOpen(serverEngine)) {
+            log("=================");
+
+            // client wrap
+            log("---Client Wrap---");
+            clientResult = clientEngine.wrap(clientOut, cTOs);
+            logEngineStatus(clientEngine, clientResult);
+            runDelegatedTasks(clientEngine);
+
+            if (firstClientWrap) {
+                firstClientWrap = false;
+                byte[] bytes = new byte[cTOs.position()];
+                ((ByteBuffer)(cTOs.duplicate().flip())).get(bytes);
+                findGreaseInClientHello(bytes);
+            }
+
+            // server wrap
+            log("---Server Wrap---");
+            serverResult = serverEngine.wrap(serverOut, sTOc);
+            logEngineStatus(serverEngine, serverResult);
+            runDelegatedTasks(serverEngine);
+
+            cTOs.flip();
+            sTOc.flip();
+
+            // client unwrap
+            log("---Client Unwrap---");
+            clientResult = clientEngine.unwrap(sTOc, clientIn);
+            logEngineStatus(clientEngine, clientResult);
+            runDelegatedTasks(clientEngine);
+
+            // server unwrap
+            log("---Server Unwrap---");
+            serverResult = serverEngine.unwrap(cTOs, serverIn);
+            logEngineStatus(serverEngine, serverResult);
+            runDelegatedTasks(serverEngine);
+
+            cTOs.compact();
+            sTOc.compact();
+
+            // After we've transferred all application data between the client
+            // and server, we close the clientEngine's outbound stream.
+            // This generates a close_notify handshake message, which the
+            // server engine receives and responds by closing itself.
+            if (!dataDone && (clientOut.limit() == serverIn.position()) &&
+                    (serverOut.limit() == clientIn.position())) {
+
+                // Check ALPN Value
+                String alpnServerValue = serverEngine.getApplicationProtocol();
+                String alpnClientValue = clientEngine.getApplicationProtocol();
+
+                if (!alpnServerValue.equals(greaseString)
+                        || !alpnClientValue.equals(greaseString)) {
+                    throw new Exception("greaseString didn't match");
+                }
+
+                // A sanity check to ensure we got what was sent.
+                checkTransfer(serverOut, clientIn);
+                checkTransfer(clientOut, serverIn);
+
+                log("\tClosing clientEngine's *OUTBOUND*...");
+                clientEngine.closeOutbound();
+                logEngineStatus(clientEngine);
+
+                dataDone = true;
+                log("\tClosing serverEngine's *OUTBOUND*...");
+                serverEngine.closeOutbound();
+                logEngineStatus(serverEngine);
+            }
+        }
+    }
+
+    private static boolean isOpen(SSLEngine engine) {
+        return (!engine.isOutboundDone() || !engine.isInboundDone());
+    }
+
+    private static void logEngineStatus(SSLEngine engine) {
+        log("\tCurrent HS State: " + engine.getHandshakeStatus());
+        log("\tisInboundDone() : " + engine.isInboundDone());
+        log("\tisOutboundDone(): " + engine.isOutboundDone());
+    }
+
+    private static void logEngineStatus(
+            SSLEngine engine, SSLEngineResult result) {
+        log("\tResult Status    : " + result.getStatus());
+        log("\tResult HS Status : " + result.getHandshakeStatus());
+        log("\tEngine HS Status : " + engine.getHandshakeStatus());
+        log("\tisInboundDone()  : " + engine.isInboundDone());
+        log("\tisOutboundDone() : " + engine.isOutboundDone());
+        log("\tMore Result      : " + result);
+    }
+
+    private static void log(String message) {
+        System.err.println(message);
+    }
+
+    // If the result indicates that we have outstanding tasks to do,
+    // go ahead and run them in this thread.
+    private static void runDelegatedTasks(SSLEngine engine) throws Exception {
+        if (engine.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+            Runnable runnable;
+            while ((runnable = engine.getDelegatedTask()) != null) {
+                log("    running delegated task...");
+                runnable.run();
+            }
+            HandshakeStatus hsStatus = engine.getHandshakeStatus();
+            if (hsStatus == HandshakeStatus.NEED_TASK) {
+                throw new Exception(
+                        "handshake shouldn't need additional tasks");
+            }
+            logEngineStatus(engine);
+        }
+    }
+
+    // Simple check to make sure everything came across as expected.
+    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
+            throws Exception {
+        a.flip();
+        b.flip();
+
+        if (!a.equals(b)) {
+            throw new Exception("Data didn't transfer cleanly");
+        } else {
+            log("\tData transferred cleanly");
+        }
+
+        a.position(a.limit());
+        b.position(b.limit());
+        a.limit(a.capacity());
+        b.limit(b.capacity());
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/libFileUtils.c openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/libFileUtils.c
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/libFileUtils.c	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/libFileUtils.c	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifdef _WIN32
+
+#include "jni.h"
+#include <windows.h>
+
+JNIEXPORT jlong JNICALL Java_SSLSocketLeak_getWinProcessHandleCount(JNIEnv *env)
+{
+    DWORD handleCount;
+    HANDLE handle = GetCurrentProcess();
+    if (GetProcessHandleCount(handle, &handleCount)) {
+        return (jlong)handleCount;
+    } else {
+        return -1L;
+    }
+}
+
+#endif  /*  _WIN32 */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020 SAP SE. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+
+import com.sun.management.UnixOperatingSystemMXBean;
+
+/*
+ * @test
+ * @bug 8256818 8257670 8257884 8257997
+ * @summary Test that creating and closing SSL Sockets without bind/connect
+ *          will not leave leaking socket file descriptors
+ * @run main/native/manual/othervm SSLSocketLeak
+ * @comment native library is required only on Windows, use the following commands:
+ *          "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+ *          cl ^
+ *              /LD ^
+ *              <path/to/jdksrc>\jdk\test\sun\security\ssl\SSLSocketImpl\libFileUtils.c ^
+ *              /I<path/to/jdkbin>\include ^
+ *              /I<path/to/jdkbin>\include\win32 ^
+ *              /FeFileUtils.dll
+ *          jtreg <...> -nativepath:. <path/to/jdk8u>\jdk\test\sun\security\ssl\SSLSocketImpl\SSLSocketLeak.java
+ */
+public class SSLSocketLeak {
+
+    // number of sockets to open/close
+    private static final int NUM_TEST_SOCK = 500;
+    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().startsWith("windows");
+    private static volatile boolean nativeLibLoaded;
+
+    // percentage of accepted growth of open handles
+    private static final int OPEN_HANDLE_GROWTH_THRESHOLD_PERCENTAGE = IS_WINDOWS ? 25 : 10;
+
+    public static void main(String[] args) throws IOException {
+        long fds_start = getProcessHandleCount();
+        System.out.println("FDs at the beginning: " + fds_start);
+
+        SocketFactory f = SSLSocketFactory.getDefault();
+        for (int i = 0; i < NUM_TEST_SOCK; i++) {
+            f.createSocket().close();
+        }
+
+        long fds_end = getProcessHandleCount();
+        System.out.println("FDs in the end: " + fds_end);
+
+        if ((fds_end - fds_start) > ((NUM_TEST_SOCK * OPEN_HANDLE_GROWTH_THRESHOLD_PERCENTAGE)) / 100) {
+            throw new RuntimeException("Too many open file descriptors. Looks leaky.");
+        }
+    }
+
+    // Return the current process handle count
+    private static long getProcessHandleCount() {
+        if (IS_WINDOWS) {
+            if (!nativeLibLoaded) {
+                System.loadLibrary("FileUtils");
+                nativeLibLoaded = true;
+            }
+            return getWinProcessHandleCount();
+        } else {
+            return ((UnixOperatingSystemMXBean)ManagementFactory.getOperatingSystemMXBean()).getOpenFileDescriptorCount();
+        }
+    }
+
+    private static native long getWinProcessHandleCount();
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021, Azul, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+//
+// Please run in othervm mode.  SunJSSE does not support dynamic system
+// properties, no way to re-use system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 8268965
+ * @summary Socket reset issue for TLS socket close
+ * @run main/othervm -Djdk.net.usePlainSocketImpl=true SSLSocketReset
+ */
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.*;
+
+public class SSLSocketReset {
+
+    public static void main(String[] args){
+        ServerThread serverThread = null;
+        Exception clientException = null;
+        try {
+            SSLServerSocketFactory sslserversocketfactory =
+                    SSLContext.getDefault().getServerSocketFactory();
+            SSLServerSocket sslServerSocket =
+                    (SSLServerSocket) sslserversocketfactory.createServerSocket(0);
+            serverThread = new ServerThread(sslServerSocket);
+            serverThread.start();
+            try {
+                Socket socket = new Socket(sslServerSocket.getInetAddress(), sslServerSocket.getLocalPort());
+                DataInputStream in = new DataInputStream(socket.getInputStream());
+                DataOutputStream out = new DataOutputStream(socket.getOutputStream());
+
+                String msg = "Hello";
+                out.writeUTF(msg);
+                out.flush();
+                msg = in.readUTF();
+            } catch(Exception e) {
+                clientException = e;
+                e.printStackTrace();
+            }
+            serverThread.join();
+        } catch(Exception e) {
+            throw new RuntimeException("Fails to start SSL server");
+        }
+        if (serverThread.exception instanceof SSLException &&
+                serverThread.exception.getMessage().equals("Unsupported or unrecognized SSL message") &&
+                !(clientException instanceof SocketException &&
+                clientException.getMessage().equals("Connection reset"))) {
+                System.out.println("Test PASSED");
+        } else {
+            throw new RuntimeException("TCP connection reset");
+        }
+    }
+
+    // Thread handling the server socket
+    private static class ServerThread extends Thread {
+        private SSLServerSocket sslServerSocket = null;
+        private SSLSocket sslSocket = null;
+        Exception exception;
+
+        ServerThread(SSLServerSocket sslServerSocket){
+            this.sslServerSocket = sslServerSocket;
+        }
+
+        public void run(){
+            try {
+                SSLSocket sslsocket = null;
+                while (true) {
+                    sslsocket = (SSLSocket) sslServerSocket.accept();
+                    DataInputStream in = new DataInputStream(sslsocket.getInputStream());
+                    DataOutputStream out = new DataOutputStream(sslsocket.getOutputStream());
+                    String string;
+                    while ((string = in.readUTF()) != null) {
+                        out.writeUTF(string);
+                        out.flush();
+                    }
+                }
+            } catch(Exception e) {
+                exception = e;
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509KeyManager/CertificateAuthorities.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509KeyManager/CertificateAuthorities.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509KeyManager/CertificateAuthorities.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509KeyManager/CertificateAuthorities.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 8206925
+ * @summary Support the "certificate_authorities" extension
+ * @library /javax/net/ssl/templates
+ * @run main/othervm CertificateAuthorities
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=false
+ *     CertificateAuthorities
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=true
+ *     CertificateAuthorities
+ *
+ * @run main/othervm CertificateAuthorities NEED_CLIENT_AUTH
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=false
+ *     CertificateAuthorities NEED_CLIENT_AUTH
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=true
+ *     CertificateAuthorities NEED_CLIENT_AUTH
+ *
+ * @run main/othervm CertificateAuthorities WANT_CLIENT_AUTH
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=false
+ *     CertificateAuthorities WANT_CLIENT_AUTH
+ * @run main/othervm -Djdk.tls.client.enableCAExtension=true
+ *     CertificateAuthorities WANT_CLIENT_AUTH
+ */
+
+import javax.net.ssl.SSLServerSocket;
+
+public final class CertificateAuthorities extends SSLSocketTemplate {
+    final ClientAuthMode clientAuthMode;
+
+    /*
+     * Run the test case.
+     */
+    public static void main(String[] args) throws Exception {
+        CertificateAuthorities testCase;
+        if (args.length != 0) {
+            testCase = new CertificateAuthorities(
+                    ClientAuthMode.valueOf(args[0]));
+        } else {
+            testCase = new CertificateAuthorities(
+                    ClientAuthMode.NO_CLIENT_AUTH);
+        }
+
+        testCase.run();
+    }
+
+    CertificateAuthorities(ClientAuthMode mode) {
+        this.clientAuthMode = mode;
+    }
+
+    @Override
+    protected void configureServerSocket(SSLServerSocket socket) {
+        if (clientAuthMode == ClientAuthMode.NEED_CLIENT_AUTH) {
+            socket.setNeedClientAuth(true);
+        } else if (clientAuthMode == ClientAuthMode.WANT_CLIENT_AUTH) {
+            socket.setWantClientAuth(true);
+        }
+    }
+
+    private static enum ClientAuthMode {
+        NEED_CLIENT_AUTH,
+        WANT_CLIENT_AUTH,
+        NO_CLIENT_AUTH
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8206925
+ * @library /javax/net/ssl/templates
+ * @summary Support the certificate_authorities extension
+ */
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import javax.security.auth.x500.X500Principal;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+
+public class CacertsLimit {
+    public static void main(String[] args) throws Exception {
+        for (String algorithm : new String[] {"SunX509", "PKIX"}) {
+            CacertsLimit.ensureLimit(algorithm);
+        }
+    }
+
+    private static void ensureLimit(String algorithm) throws Exception {
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
+        tmf.init((KeyStore)null);
+        TrustManager[] tms = tmf.getTrustManagers();
+
+        if (tms == null || tms.length == 0) {
+            throw new Exception("No default key store used for trust manager");
+        }
+
+        if (!(tms[0] instanceof X509TrustManager)) {
+            throw new Exception(
+                "The trust manger is not an instance of X509TrustManager");
+        }
+
+        checkLimit(((X509TrustManager)tms[0]).getAcceptedIssuers());
+    }
+
+    private static void checkLimit(
+            X509Certificate[] trustedCerts) throws Exception {
+        int sizeAccount = 0;
+        for (X509Certificate cert : trustedCerts) {
+            X500Principal x500Principal = cert.getSubjectX500Principal();
+            byte[] encodedPrincipal = x500Principal.getEncoded();
+            sizeAccount += encodedPrincipal.length;
+            if (sizeAccount > 0xFFFF) {
+                throw new Exception(
+                        "There are too many trusted CAs in cacerts. The " +
+                        "certificate_authorities extension cannot be used " +
+                        "for TLS connections.  Please rethink about the size" +
+                        "of the cacerts, or have a release note for the " +
+                        "impacted behaviors");
+            } else if (sizeAccount > 0x4000) {
+                throw new Exception(
+                        "There are too many trusted CAs in cacerts. The " +
+                        "certificate_authorities extension cannot be " +
+                        "packaged in one TLS record, which would result in " +
+                        "interoperability issues.  Please rethink about the " +
+                        "size of the cacerts, or have a release note for " +
+                        "the impacted behaviors");
+            }
+        }
+    }
+}
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/TooManyCAs.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/TooManyCAs.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/TooManyCAs.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/ssl/X509TrustManagerImpl/TooManyCAs.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8206925
+ * @library /javax/net/ssl/templates
+ * @summary Support the certificate_authorities extension
+ * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 TooManyCAs
+ * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.client.enableCAExtension=true TooManyCAs
+ */
+import javax.net.ssl.*;
+import javax.security.auth.x500.X500Principal;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+
+/**
+ * Check if the connection can be established if the client or server trusts
+ * more CAs such that it exceeds the size limit of the certificate_authorities
+ * extension (2^16).
+ */
+public class TooManyCAs implements SSLContextTemplate {
+
+    private static final String[][][] protocols = {
+            {{"TLSv1.3"}, {"TLSv1.3"}},
+            {{"TLSv1.3", "TLSv1.2"}, {"TLSv1.3"}},
+            {{"TLSv1.3"}, {"TLSv1.3", "TLSv1.2"}},
+    };
+
+    private final String[] clientProtocols;
+    private final String[] serverProtocols;
+    private final boolean needClientAuth;
+
+    TooManyCAs(int index, boolean needClientAuth) {
+        this.clientProtocols = protocols[index][0];
+        this.serverProtocols = protocols[index][1];
+        this.needClientAuth = needClientAuth;
+    }
+
+    // Servers are configured before clients, increment test case after.
+    void configureClientSocket(SSLSocket clientSocket) {
+        System.err.print("Setting client protocol(s): ");
+        Arrays.stream(clientProtocols).forEachOrdered(System.err::print);
+        System.err.println();
+
+        clientSocket.setEnabledProtocols(clientProtocols);
+    }
+
+    void configureServerSocket(SSLServerSocket serverSocket) {
+        System.err.print("Setting server protocol(s): ");
+        Arrays.stream(serverProtocols).forEachOrdered(System.err::print);
+        System.err.println();
+
+        serverSocket.setEnabledProtocols(serverProtocols);
+        if (needClientAuth) {
+            serverSocket.setNeedClientAuth(true);
+        }
+    }
+
+    @Override
+    public TrustManager createClientTrustManager() throws Exception {
+        TrustManager trustManager =
+                SSLContextTemplate.super.createClientTrustManager();
+        return new BogusX509TrustManager(
+                (X509TrustManager)trustManager);
+    }
+
+    @Override
+    public TrustManager createServerTrustManager() throws Exception {
+        TrustManager trustManager =
+                SSLContextTemplate.super.createServerTrustManager();
+        return new BogusX509TrustManager(
+                (X509TrustManager)trustManager);
+    }
+
+    /*
+     * Run the test case.
+     */
+    public static void main(String[] args) throws Exception {
+        for (int i = 0; i < protocols.length; i++) {
+            (new TooManyCAs(i, false)).run();
+            (new TooManyCAs(i, true)).run();
+        }
+    }
+
+    private void run() throws Exception {
+        SSLServerSocket listenSocket = null;
+        SSLSocket serverSocket = null;
+        ClientSocket clientSocket = null;
+        try {
+            SSLServerSocketFactory serversocketfactory =
+                    createServerSSLContext().getServerSocketFactory();
+            listenSocket =
+                    (SSLServerSocket)serversocketfactory.createServerSocket(0);
+            listenSocket.setNeedClientAuth(false);
+            listenSocket.setEnableSessionCreation(true);
+            listenSocket.setUseClientMode(false);
+            configureServerSocket(listenSocket);
+
+            System.err.println("Starting client");
+            clientSocket = new ClientSocket(listenSocket.getLocalPort());
+            clientSocket.start();
+
+            System.err.println("Accepting client requests");
+            serverSocket = (SSLSocket)listenSocket.accept();
+
+            if (!clientSocket.isDone) {
+                System.err.println("Waiting 3 seconds for client ");
+                Thread.sleep(3000);
+            }
+
+            System.err.println("Sending data to client ...");
+            String serverData = "Hi, I am server";
+            BufferedWriter os = new BufferedWriter(
+                    new OutputStreamWriter(serverSocket.getOutputStream()));
+            os.write(serverData, 0, serverData.length());
+            os.newLine();
+            os.flush();
+        } finally {
+            if (listenSocket != null) {
+                listenSocket.close();
+            }
+
+            if (serverSocket != null) {
+                serverSocket.close();
+            }
+        }
+
+        if (clientSocket != null && clientSocket.clientException != null) {
+            throw clientSocket.clientException;
+        }
+    }
+
+    private class ClientSocket extends Thread{
+        boolean isDone = false;
+        int serverPort = 0;
+        Exception clientException;
+
+        public ClientSocket(int serverPort) {
+            this.serverPort = serverPort;
+        }
+
+        @Override
+        public void run() {
+            SSLSocket clientSocket = null;
+            String clientData = "Hi, I am client";
+            try {
+                System.err.println(
+                        "Connecting to server at port " + serverPort);
+                SSLSocketFactory sslSocketFactory =
+                        createClientSSLContext().getSocketFactory();
+                clientSocket = (SSLSocket)sslSocketFactory.createSocket(
+                        InetAddress.getLocalHost(), serverPort);
+                configureClientSocket(clientSocket);
+
+                System.err.println("Sending data to server ...");
+
+                BufferedWriter os = new BufferedWriter(
+                        new OutputStreamWriter(clientSocket.getOutputStream()));
+                os.write(clientData, 0, clientData.length());
+                os.newLine();
+                os.flush();
+
+                System.err.println("Reading data from server");
+                BufferedReader is = new BufferedReader(
+                        new InputStreamReader(clientSocket.getInputStream()));
+                String data = is.readLine();
+                System.err.println("Received Data from server: " + data);
+            } catch (Exception e) {
+                clientException = e;
+                System.err.println("unexpected client exception: " + e);
+            } finally {
+                if (clientSocket != null) {
+                    try {
+                        clientSocket.close();
+                        System.err.println("client socket closed");
+                    } catch (IOException ioe) {
+                        clientException = ioe;
+                    }
+                }
+
+                isDone = true;
+            }
+        }
+    }
+
+    // Construct a bogus trust manager which has more CAs such that exceed
+    // the size limit of the certificate_authorities extension (2^16).
+    private static final class BogusX509TrustManager
+            extends X509ExtendedTrustManager implements X509TrustManager {
+        private final X509ExtendedTrustManager tm;
+
+        private BogusX509TrustManager(X509TrustManager trustManager) {
+            this.tm = (X509ExtendedTrustManager)trustManager;
+        }
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain,
+               String authType, Socket socket) throws CertificateException {
+            tm.checkClientTrusted(chain, authType, socket);
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain,
+               String authType, Socket socket) throws CertificateException {
+            tm.checkServerTrusted(chain, authType, socket);
+        }
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain,
+            String authType, SSLEngine sslEngine) throws CertificateException {
+
+            tm.checkClientTrusted(chain, authType, sslEngine);
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain,
+            String authType, SSLEngine sslEngine) throws CertificateException {
+
+            tm.checkServerTrusted(chain, authType, sslEngine);
+        }
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain,
+               String authType) throws CertificateException {
+            tm.checkServerTrusted(chain, authType);
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain,
+               String authType) throws CertificateException {
+            tm.checkServerTrusted(chain, authType);
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            X509Certificate[] trustedCerts = tm.getAcceptedIssuers();
+            int sizeAccount = 0;
+            for (X509Certificate cert: trustedCerts) {
+                X500Principal x500Principal = cert.getSubjectX500Principal();
+                byte[] encodedPrincipal = x500Principal.getEncoded();
+                sizeAccount += encodedPrincipal.length;
+            }
+
+            // 0xFFFF: the size limit of the certificate_authorities extension
+            int duplicated = (0xFFFF + sizeAccount) / sizeAccount;
+            X509Certificate[] returnedCAs =
+                    new X509Certificate[trustedCerts.length * duplicated];
+            for (int i = 0; i < duplicated; i++) {
+                System.arraycopy(trustedCerts, 0,
+                    returnedCAs,
+                    i * trustedCerts.length + 0, trustedCerts.length);
+            }
+
+            return returnedCAs;
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/tools/jarsigner/concise_jarsigner.sh openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/tools/jarsigner/concise_jarsigner.sh
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/tools/jarsigner/concise_jarsigner.sh	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/tools/jarsigner/concise_jarsigner.sh	2021-09-01 14:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, 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
@@ -22,7 +22,7 @@
 #
 
 # @test
-# @bug 6802846 8172529 8227758
+# @bug 6802846 8172529 8227758 8260960
 # @summary jarsigner needs enhanced cert validation(options)
 #
 # @run shell/timeout=240 concise_jarsigner.sh
@@ -109,17 +109,20 @@
 LINES=`$JARSIGNER -verify a.jar -verbose:grouped | grep $YEAR | wc -l`
 [ $LINES = 12 ] || exit $LINENO
 
-# 4 groups: MANIFST, unrelated, signed, unsigned
+# 5 groups: MANIFEST, signature related entries, directory entries,
+# signed entries, and unsigned entries.
 LINES=`$JARSIGNER -verify a.jar -verbose:summary | grep $YEAR | wc -l`
-[ $LINES = 4 ] || exit $LINENO
+[ $LINES = 5 ] || exit $LINENO
 
-# still 4 groups, but MANIFEST group has no other file
+# still 5 groups, but MANIFEST group and directory entry group
+# have no other file
 LINES=`$JARSIGNER -verify a.jar -verbose:summary | grep "more)" | wc -l`
 [ $LINES = 3 ] || exit $LINENO
 
-# 5 groups: MANIFEST, unrelated, signed by a1/a2, signed by a2, unsigned
+# 6 groups: MANIFEST, signature related entries, directory entries,
+# signed entries by a1/a2, signed entries by a2, and unsigned entries.
 LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep $YEAR | wc -l`
-[ $LINES = 5 ] || exit $LINENO
+[ $LINES = 6 ] || exit $LINENO
 
 # 2 for MANIFEST, 2*2 for A1/A2, 2 for A3/A4
 LINES=`$JARSIGNER -verify a.jar -verbose -certs | grep "\[certificate" | wc -l`
@@ -133,7 +136,8 @@
 LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep "\[certificate" | wc -l`
 [ $LINES = 5 ] || exit $LINENO
 
-# still 5 groups, but MANIFEST group has no other file
+# still 6 groups, but MANIFEST group and directory entry group
+# have no other file
 LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep "more)" | wc -l`
 [ $LINES = 4 ] || exit $LINENO
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/x509/AlgorithmId/OidTableInit.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/x509/AlgorithmId/OidTableInit.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/security/x509/AlgorithmId/OidTableInit.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/security/x509/AlgorithmId/OidTableInit.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Google Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8156584
+ * @summary AlgorithmId.get initialization thread safety
+ * @run main/othervm OidTableInit
+ */
+
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import sun.security.x509.AlgorithmId;
+
+public class OidTableInit {
+    public static void main(String[] args) throws Throwable {
+        final String[] algorithmNames = {
+            "PBKDF2WITHHMACSHA1",
+            "PBEWITHMD5ANDDES",
+            "DSA",
+            "SHA384WITHRSA",
+            "RSA",
+            "SHA1WITHDSA",
+            "SHA512WITHRSA",
+            "MD2WITHRSA",
+            "PBEWITHSHA1ANDDESEDE",
+            "SHA1WITHRSA",
+            "DIFFIEHELLMAN",
+            "MD5WITHRSA",
+            "PBEWITHSHA1ANDRC2_40",
+            "SHA256WITHRSA",
+        };
+
+        final int THREADS = 2;
+        final ExecutorService pool = Executors.newFixedThreadPool(THREADS);
+        final CountDownLatch startingGate = new CountDownLatch(THREADS);
+        final Runnable r = new Runnable() { public void run() {
+            startingGate.countDown();
+            do {} while (startingGate.getCount() > 0);
+            try {
+                for (String algorithmName : algorithmNames)
+                    AlgorithmId.get(algorithmName);
+            } catch (Throwable fail) {
+                throw new AssertionError(fail);
+            }
+        }};
+        final ArrayList<Future<?>> futures = new ArrayList<>();
+        for (int i = 0; i < THREADS; i++)
+            futures.add(pool.submit(r));
+        pool.shutdown();
+        for (Future<?> future : futures) future.get();
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/IntHashtable/Bug4170614Test.sh openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/IntHashtable/Bug4170614Test.sh
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/IntHashtable/Bug4170614Test.sh	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/IntHashtable/Bug4170614Test.sh	2021-09-01 14:33:15.000000000 +0000
@@ -60,10 +60,9 @@
 TEST_JAVABASE=${TESTCLASSES}/java.base
 mkdir -p ${TEST_JAVABASE}
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-    -Xmodule:java.base \
     -d ${TEST_JAVABASE} Bug4170614Test.java
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xpatch:java.base=${TEST_JAVABASE} java.text.Bug4170614Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/p:${TEST_JAVABASE} java.text.Bug4170614Test
 
 result=$?
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/resources/LocaleData openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/resources/LocaleData
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/resources/LocaleData	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/resources/LocaleData	2021-09-01 14:33:15.000000000 +0000
@@ -2399,7 +2399,7 @@
 FormatData/uk_UA/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 
 # bug #4122468 # Use common country names
-LocaleNames//CI=C\u00F4te d'Ivoire
+LocaleNames//CI=C\u00F4te d\u2019Ivoire
 LocaleNames//LY=Libya
 LocaleNames//RU=Russia
 LocaleNames//VN=Vietnam
@@ -2470,7 +2470,7 @@
 LocaleNames//fo=Faroese
 LocaleNames//iu=Inuktitut
 LocaleNames//sg=Sango
-LocaleNames//si=Sinhalese
+LocaleNames//si=Sinhala
 
 #bug 4331446 Localized country and language names for major locales (excerpt only)
 LocaleNames/es/SV=El Salvador
@@ -5471,7 +5471,7 @@
 # JE, GG, IM (6544471)
 LocaleNames//JE=Jersey
 LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle Of Man
+LocaleNames//IM=Isle of Man
 
 # bugs 6497154
 CalendarData/sk/firstDayOfWeek=2
@@ -5550,11 +5550,11 @@
 # JE, GG, IM (6544471)
 LocaleNames//JE=Jersey
 LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle Of Man
+LocaleNames//IM=Isle of Man
 
 # BL, MF (6627549)
-LocaleNames//BL=Saint Barth\u00e9lemy
-LocaleNames//MF=Saint Martin
+LocaleNames//BL=St. Barth\u00e9lemy
+LocaleNames//MF=St. Martin
 
 # bug 6609737
 FormatData/de/TimePatterns/0=HH:mm' Uhr 'z
@@ -8324,3 +8324,114 @@
 TimeZoneNames/en/Turkey/2=TRT
 TimeZoneNames/en/Turkey/3=Turkey Summer Time
 TimeZoneNames/en/Turkey/4=TRST
+
+# bug 8255086
+LocaleNames//bn=Bangla
+LocaleNames//fy=Western Frisian
+LocaleNames//gl=Galician
+LocaleNames//ht=Haitian Creole
+LocaleNames//kj=Kuanyama
+LocaleNames//kl=Kalaallisut
+LocaleNames//ky=Kyrgyz
+LocaleNames//nb=Norwegian Bokm\u00E5l
+LocaleNames//or=Odia
+LocaleNames//os=Ossetic
+LocaleNames//pa=Punjabi
+LocaleNames//ps=Pashto
+LocaleNames//rm=Romansh
+LocaleNames//si=Sinhala
+LocaleNames//to=Tongan
+LocaleNames//ug=Uyghur
+LocaleNames//vo=Volap\u00FCk
+LocaleNames//ang=Old English
+LocaleNames//arc=Aramaic
+LocaleNames//arn=Mapuche
+LocaleNames//bas=Basaa
+LocaleNames//car=Carib
+LocaleNames//chn=Chinook Jargon
+LocaleNames//crh=Crimean Turkish
+LocaleNames//den=Slave
+LocaleNames//dum=Middle Dutch
+LocaleNames//egy=Ancient Egyptian
+LocaleNames//enm=Middle English
+LocaleNames//frm=Middle French
+LocaleNames//fro=Old French
+LocaleNames//gmh=Middle High German
+LocaleNames//goh=Old High German
+LocaleNames//grc=Ancient Greek
+LocaleNames//gwi=Gwich\u02BCin
+LocaleNames//luo=Luo
+LocaleNames//lus=Mizo
+LocaleNames//mga=Middle Irish
+LocaleNames//mul=Multiple languages
+LocaleNames//mus=Muscogee
+LocaleNames//new=Newari
+LocaleNames//nob=Bokm\u00E5l, Norwegian
+LocaleNames//non=Old Norse
+LocaleNames//nqo=N\u2019Ko
+LocaleNames//nso=Northern Sotho
+LocaleNames//ota=Ottoman Turkish
+LocaleNames//peo=Old Persian
+LocaleNames//pro=Old Proven\u00E7al
+LocaleNames//sah=Sakha
+LocaleNames//sga=Old Irish
+LocaleNames//sog=Sogdien
+LocaleNames//tog=Nyasa Tonga
+LocaleNames//und=Unknown language
+LocaleNames//vol=Volap\u00FCk
+LocaleNames//wal=Wolaytta
+LocaleNames//Beng=Bangla
+LocaleNames//Geok=Georgian Khutsuri
+LocaleNames//Hans=Simplified
+LocaleNames//Hant=Traditional
+LocaleNames//Hrkt=Japanese syllabaries
+LocaleNames//Lana=Lanna
+LocaleNames//Lisu=Fraser
+LocaleNames//Mand=Mandaean
+LocaleNames//Nkgb=Naxi Geba
+LocaleNames//Orya=Odia
+LocaleNames//Plrd=Pollard Phonetic
+LocaleNames//Sind=Khudawadi
+LocaleNames//Wara=Varang Kshiti
+LocaleNames//Zinh=Inherited
+LocaleNames//Zyyy=Common
+LocaleNames//Zzzz=Unknown Script
+LocaleNames//AG=Antigua & Barbuda
+LocaleNames//AX=\u00C5land Islands
+LocaleNames//BA=Bosnia & Herzegovina
+LocaleNames//BL=St. Barth\u00E9lemy
+LocaleNames//BQ=Caribbean Netherlands
+LocaleNames//CC=Cocos (Keeling) Islands
+LocaleNames//CD=Congo - Kinshasa
+LocaleNames//CG=Congo - Brazzaville
+LocaleNames//CI=C\u00F4te d\u2019Ivoire
+LocaleNames//CW=Cura\u00E7ao
+LocaleNames//CZ=Czechia
+LocaleNames//GS=South Georgia & South Sandwich Islands
+LocaleNames//HK=Hong Kong SAR China
+LocaleNames//HM=Heard & McDonald Islands
+LocaleNames//IM=Isle of Man
+LocaleNames//KN=St. Kitts & Nevis
+LocaleNames//LC=St. Lucia
+LocaleNames//MF=St. Martin
+LocaleNames//MK=North Macedonia
+LocaleNames//MM=Myanmar (Burma)
+LocaleNames//MO=Macao SAR China
+LocaleNames//PM=St. Pierre & Miquelon
+LocaleNames//PN=Pitcairn Islands
+LocaleNames//PS=Palestinian Territories
+LocaleNames//RE=R\u00E9union
+LocaleNames//SH=St. Helena
+LocaleNames//SJ=Svalbard & Jan Mayen
+LocaleNames//ST=S\u00E3o Tom\u00E9 & Pr\u00EDncipe
+LocaleNames//SX=Sint Maarten
+LocaleNames//SZ=Eswatini
+LocaleNames//TC=Turks & Caicos Islands
+LocaleNames//TT=Trinidad & Tobago
+LocaleNames//UM=U.S. Outlying Islands
+LocaleNames//VA=Vatican City
+LocaleNames//VC=St. Vincent & Grenadines
+LocaleNames//WF=Wallis & Futuna
+LocaleNames//035=Southeast Asia
+LocaleNames//053=Australasia
+LocaleNames//419=Latin America
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/resources/LocaleDataTest.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/resources/LocaleDataTest.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/text/resources/LocaleDataTest.java	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/text/resources/LocaleDataTest.java	2021-09-01 14:33:15.000000000 +0000
@@ -38,7 +38,7 @@
  *      7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8145952
  *      8164784 8187946 8195478 8193552 8202026 8204269 8208746 8209775 8234228
- *      8250665
+ *      8250665 8255086
  * @summary Verify locale data
  *
  */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/util/calendar/zi/Beyond2037.java openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/util/calendar/zi/Beyond2037.java
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/sun/util/calendar/zi/Beyond2037.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/sun/util/calendar/zi/Beyond2037.java	2021-09-01 14:33:15.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8073446 8262110
+ * @summary Tests DST related beyond the year 2037
+ * @run testng Beyond2037
+ */
+
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+@Test
+public class Beyond2037 {
+
+    @DataProvider
+    Object[][] dstTransition() {
+        return new Object[][] {
+            {"2037/03/08 01:59:59:999", "2037/03/08 01:59:59:999"},
+            {"2037/03/08 02:00:00:000", "2037/03/08 03:00:00:000"},
+            {"2038/03/14 01:59:59:999", "2038/03/14 01:59:59:999"},
+            {"2038/03/14 02:00:00:000", "2038/03/14 03:00:00:000"},
+            {"2099/03/08 01:59:59:999", "2099/03/08 01:59:59:999"},
+            {"2099/03/08 02:00:00:000", "2099/03/08 03:00:00:000"},
+            {"2100/03/14 01:59:59:999", "2100/03/14 01:59:59:999"},
+            {"2100/03/14 02:00:00:000", "2100/03/14 03:00:00:000"},
+            {"8000/03/12 01:59:59:999", "8000/03/12 01:59:59:999"},
+            {"8000/03/12 02:00:00:000", "8000/03/12 03:00:00:000"},
+        };
+    }
+
+    @Test(dataProvider="dstTransition")
+    public void testDstTransition(String source, String expected) throws Exception {
+        TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss:SSS" );
+        sdf.setTimeZone(timeZone);
+        assertEquals(sdf.format(sdf.parse(source)), expected);
+    }
+
+    @Test
+    public void testGetOffset() throws Exception {
+        TimeZone timeZone = TimeZone.getTimeZone("PST8PDT");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(timeZone);
+        long tMilli = df.parse("7681-03-09 03:20:49").getTime();
+        assertEquals(timeZone.getOffset(tMilli), -25200000);
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/test/tools/launcher/MultipleJRE.sh openjdk-8-8u312-b07/=unpacked-tar3=/test/tools/launcher/MultipleJRE.sh
--- openjdk-8-8u292-b10/=unpacked-tar3=/test/tools/launcher/MultipleJRE.sh	2021-02-18 17:34:20.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/test/tools/launcher/MultipleJRE.sh	2021-09-01 14:33:15.000000000 +0000
@@ -308,7 +308,7 @@
 # Main test sequence starts here
 #
 RELEASE=`$JAVA -version 2>&1 | head -n 1 | cut -d ' ' -f 3 | \
-  sed -e "s/\"//g"`
+  sed -e "s/\"//g" | sed -e "s/\r//g"`
 BASE_RELEASE=`echo $RELEASE | sed -e "s/-.*//g"`
 
 #
diff -Nru openjdk-8-8u292-b10/=unpacked-tar3=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar3=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar3=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar3=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar4=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar4=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/.hg_archival.txt	2021-10-15 03:03:52.000000000 +0000
@@ -1,4 +1,4 @@
 repo: a61af66fc99eb5ec9d50c05b0c599757b1289ceb
-node: 9e58eb00ef60b6db87c0491048649b4dbfcf8f1a
+node: 55c41dea0d822f8bd0414d7d990afe4257055703
 branch: default
-tag: aarch64-shenandoah-jdk8u292-b10
+tag: aarch64-shenandoah-jdk8u312-b07
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/.hgtags openjdk-8-8u312-b07/=unpacked-tar4=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar4=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/.hgtags	2021-10-15 03:03:52.000000000 +0000
@@ -1558,3 +1558,38 @@
 65907019826ad9fe7d13df531e0c108cc1f179b0 jdk8u292-b09
 a47191f809c79f7dce9c2d799124e5dbb2bfd5c1 aarch64-shenandoah-jdk8u292-b09
 2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-b10
+9e58eb00ef60b6db87c0491048649b4dbfcf8f1a aarch64-shenandoah-jdk8u292-b10
+2a6952bb390975722d73580d1dc3cb6ac69b76b0 jdk8u292-ga
+a435c913c8ce30f0487d05cfec1d9be3fcc57f10 jdk8u302-b00
+d24969e49a6af3353c84b9a0f9aedd4736156b66 jdk8u302-b01
+2e28d0d177b8a9726cf4384253ed7e9be1ea9b11 aarch64-shenandoah-jdk8u302-b01
+8a152c8e9f14e3bdeebd7bf4e8eb2a6e8f9bbb7c jdk8u302-b02
+0b81e87646c978cf5df8c330eae3bec77100ca68 aarch64-shenandoah-jdk8u302-b02
+99e4a82f17e8debc5225d1c8834acdac673aa676 jdk8u302-b03
+c1a04161219677c819b8ee6c4b50d4dd1092b6be aarch64-shenandoah-jdk8u302-b03
+7f48d1e4d2610400067429377d1dd98336f9dbd8 aarch64-shenandoah-jdk8u302-b03-shenandoah-merge-2021-06-23
+362d99aef38e6e179061f221df20bbb9f65b8f89 jdk8u302-b04
+cef2221ea4d8d5f392e3eb3d183f11c2ebbc704d aarch64-shenandoah-jdk8u302-b04
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u302-b05
+fca142bcb03959b9b81ab14f6d1e618f41aec32b aarch64-shenandoah-jdk8u302-b05
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u312-b00
+782f3b88b5ba7d420e6c5894c19f9bf1980df239 jdk8u302-b06
+c025871295efbf0a0dae1ef92ebf37ef61ae0b22 aarch64-shenandoah-jdk8u302-b06
+78dfe32cac588b01e28792d42e761fa35a80e8f9 jdk8u302-b07
+a48af4014158fff2453da8f85a994853596a0284 aarch64-shenandoah-jdk8u302-b07
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-b08
+e7fba27b8fdee0a31376774d6a61522ed098a11f aarch64-shenandoah-jdk8u302-b08
+a209b6f5b09af88bae12ffeebd382f3ef804b99f jdk8u302-ga
+2f7a380c9a0ac0cf20fdb17d7b6a135da05b5d04 jdk8u312-b01
+bd8b3f13eaac79bb510f208cbfa4fd31f3b0c216 aarch64-shenandoah-jdk8u312-b01
+4735f3031e239dfd76c0ed2ce25c8f1cc9bd7c1f jdk8u312-b02
+2d50ba15bdc81f1e9711a4e874f77e5fff496f32 aarch64-shenandoah-jdk8u312-b02
+a6da205dfd9f0d71dae93a310652e29d830c95ee jdk8u312-b03
+9b521fc2cb93a72aa435d53c60f1bc67f771ced3 aarch64-shenandoah-jdk8u312-b03
+21394894714b0fb17e6015483e4658f75e30bbc5 jdk8u312-b04
+e9539ed1b99e46eb4f8e0fb41a59981e923dbbaf aarch64-shenandoah-jdk8u312-b04
+e7fc0c4f478e78e2ef40b8d098c02a958e385227 jdk8u312-b05
+0155888ff4c9e605cb4eb2639b2e01b42010d703 aarch64-shenandoah-jdk8u312-b05
+17d6c475d5658aa4a976f9a78939f4521526eb37 aarch64-shenandoah-jdk8u312-b05-shenandoah-merge-2021-10-07
+e2ac513ec7b343f596861645f0696bc6f0fb4364 jdk8u312-b06
+8aac6d08b58e31e4938a32c2662bf822d87a5440 jdk8u312-b07
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/defs.make openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/defs.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/defs.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/defs.make	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -142,36 +142,28 @@
         OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
       endif
 
-      ifeq ($(OBJCOPY),)
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
-        ENABLE_FULL_DEBUG_SYMBOLS=0
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-      else
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: AIX .debuginfo files will be produced by copying debug object.")
 
-        # Library stripping policies for .debuginfo configs:
-        #   all_strip - strips everything from the library
-        #   min_strip - strips most stuff from the library; leaves minimum symbols
-        #   no_strip  - does not strip the library at all
-        #
-        # Oracle security policy requires "all_strip". A waiver was granted on
-        # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-        #
-        # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
-        #
-        STRIP_POLICY ?= min_strip
+      # Library stripping policies for .debuginfo configs:
+      #   all_strip - strips everything from the library
+      #   min_strip - strips most stuff from the library; leaves minimum symbols
+      #   no_strip  - does not strip the library at all
+      #
+      # Oracle security policy requires "all_strip". A waiver was granted on
+      # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+      #
+      # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+      #
+      STRIP_POLICY ?= min_strip
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-        ZIP_DEBUGINFO_FILES ?= 1
+      ZIP_DEBUGINFO_FILES ?= 1
 
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-      endif
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
     endif # ENABLE_FULL_DEBUG_SYMBOLS=1
   endif # BUILD_FLAVOR
 endif # JDK_6_OR_EARLIER
@@ -185,13 +177,13 @@
 
 # client and server subdirectories have symbolic links to ../libjsig.so
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
-#  else
-#    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
-#  endif
-#endif
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
+  else
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+  endif
+endif
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -199,25 +191,25 @@
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 ifeq ($(JVM_VARIANT_CLIENT),true)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-#  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
-#    else
-#      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
-#    endif
-#  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
+    else
+      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+    endif
+  endif
 endif
 
 # Serviceability Binaries
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/jsig.make	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -64,9 +64,9 @@
 	$(QUIETLY) $(CXX) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) -o $@ $< -ldl
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
 #  ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #  else
@@ -75,11 +75,13 @@
 #    # implied else here is no stripping at all
 #    endif
 #  endif
-#  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-#	$(RM) $(LIBJSIG_DEBUGINFO)
-#  endif
-#endif
+  ifneq ($(STRIP_POLICY),no_strip)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+	$(RM) $(LIBJSIG_DEBUGINFO)
+    endif
+  endif
+endif
 
 install_jsig: $(LIBJSIG)
 	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/saproc.make	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -88,16 +88,16 @@
 	           -o $@                                                \
 	           -lthread_db
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-  ifeq ($(STRIP_POLICY),all_strip)
-	$(QUIETLY) $(STRIP) $@
-  else
-    ifeq ($(STRIP_POLICY),min_strip)
-	$(QUIETLY) $(STRIP) -g $@
-    # implied else here is no stripping at all
-    endif
-  endif
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJSIG_DEBUGINFO)
+#  ifeq ($(STRIP_POLICY),all_strip)
+#	$(QUIETLY) $(STRIP) $@
+#  else
+#    ifeq ($(STRIP_POLICY),min_strip)
+#	$(QUIETLY) $(STRIP) -g $@
+#    # implied else here is no stripping at all
+#    endif
+#  endif
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
 	$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
 	$(RM) $(LIBSAPROC_DEBUGINFO)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/vm.make openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/vm.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/aix/makefiles/vm.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/aix/makefiles/vm.make	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2020 SAP SE. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -329,9 +329,9 @@
 #           fi 							        \
 #	}
 
-#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-#	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-#	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # AIX produces .debuginfo from copy of -g compiled object prior to strip
+	$(QUIETLY) $(CP) $@ $(LIBJVM_DEBUGINFO)
 #    ifeq ($(STRIP_POLICY),all_strip)
 #	$(QUIETLY) $(STRIP) $@
 #    else
@@ -340,11 +340,13 @@
 #      # implied else here is no stripping at all
 #      endif
 #    endif
-#    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-#	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
-#	$(RM) $(LIBJVM_DEBUGINFO)
-#  endif
-#endif
+    ifneq ($(STRIP_POLICY),no_strip)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+	$(RM) $(LIBJVM_DEBUGINFO)
+      endif
+    endif
+endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
 DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/gcc.make	2021-10-15 03:03:52.000000000 +0000
@@ -313,10 +313,10 @@
 
 # Work around some compiler bugs.
 ifeq ($(USE_CLANG), true)
-  ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 2), 1)
-    OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
-    OPT_CFLAGS/unsafe.o += -O1
-  endif
+  # Known to fail with clang <= 7.0; 
+  # do no optimize these on later clang until verified
+  OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
+  OPT_CFLAGS/unsafe.o += -O1
 else
   # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation.
   ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
@@ -362,7 +362,15 @@
 # Linker flags
 
 # statically link libstdc++.so, work with gcc but ignored by g++
-STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+ifeq ($(OS_VENDOR), Darwin)
+  ifeq ($(USE_CLANG), true)
+    STATIC_STDCXX = -Wl,-Bstatic -lc++ -Wl,-Bdynamic
+  else
+    STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+  endif
+else
+  STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+endif
 
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/jsig.make openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/jsig.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/jsig.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/jsig.make	2021-10-15 03:03:52.000000000 +0000
@@ -54,6 +54,11 @@
 
 LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
+ifeq ($(OS_VENDOR), Darwin)
+# bring in minimum version argument or we'll fail on OSX 10.10
+LFLAGS_JSIG += $(LFLAGS)
+endif
+
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
   JSIG_DEBUG_CFLAGS = -g
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/saproc.make openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/saproc.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/bsd/makefiles/saproc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/bsd/makefiles/saproc.make	2021-10-15 03:03:52.000000000 +0000
@@ -78,8 +78,10 @@
     ifneq ($(SDKPATH),)
       SA_SYSROOT_FLAGS += -isysroot "$(SDKPATH)" -iframework"$(SDKPATH)/System/Library/Frameworks"
     endif
-    # always needed, even if SDKPATH is empty
-    SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    ifneq ($(wildcard "$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"), "")
+      # always needed, even if SDKPATH is empty
+      SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    endif
   else
     SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
     SALIBS = 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/make/linux/makefiles/gcc.make openjdk-8-8u312-b07/=unpacked-tar4=/make/linux/makefiles/gcc.make
--- openjdk-8-8u292-b10/=unpacked-tar4=/make/linux/makefiles/gcc.make	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/make/linux/makefiles/gcc.make	2021-10-15 03:03:52.000000000 +0000
@@ -226,6 +226,18 @@
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 
+# On newer GCCs, the compiler complains about null being passed
+# to the %s format specifier. The warning appears only on 8u,
+# but the code is largely the same up to trunk. We disable
+# the warning until the code is fixed, to allow builds with
+# -Werror (the default).
+# See JDK-8269388 and PR3798 in IcedTea:
+# https://icedtea.wildebeest.org/hg/icedtea8-forest/hotspot/rev/9f2ceb42dc64
+# Option only exists on GCC 7 and later, checked by configure
+ifeq ($(USE_FORMAT_OVERFLOW), 1)
+  CFLAGS_WARN/os_linux.o = $(CFLAGS_WARN/DEFAULT) -Wno-error=format-overflow
+endif
+
 # The flags to use for an Optimized g++ build
 OPT_CFLAGS/SIZE=-Os
 OPT_CFLAGS/SPEED=-O3
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/aarch64.ad openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/aarch64.ad
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/aarch64.ad	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/aarch64.ad	2021-10-15 03:03:52.000000000 +0000
@@ -926,6 +926,7 @@
 
 source_hpp %{
 
+#include "opto/addnode.hpp"
 #if INCLUDE_ALL_GCS
 #include "shenandoahBarrierSetAssembler_aarch64.hpp"
 #endif
@@ -984,6 +985,9 @@
 
   // predicate controlling translation of StoreCM
   bool unnecessary_storestore(const Node *storecm);
+
+  // predicate controlling addressing modes
+  bool size_fits_all_mem_uses(AddPNode* addp, int shift);
 %}
 
 source %{
@@ -2163,6 +2167,26 @@
   return FP_REG_mask();
 }
 
+bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
+  for (DUIterator_Fast imax, i = addp->fast_outs(imax); i < imax; i++) {
+    Node* u = addp->fast_out(i);
+    if (u->is_LoadStore()) {
+      // On AArch64, LoadStoreNodes (i.e. compare and swap
+      // instructions) only take register indirect as an operand, so
+      // any attempt to use an AddPNode as an input to a LoadStoreNode
+      // must fail.
+      return false;
+    }
+    if (u->is_Mem()) {
+      int opsize = u->as_Mem()->memory_size();
+      assert(opsize > 0, "unexpected memory operand size");
+      if (u->as_Mem()->memory_size() != (1<<shift)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
 
 #define MOV_VOLATILE(REG, BASE, INDEX, SCALE, DISP, SCRATCH, INSN)	\
   MacroAssembler _masm(&cbuf);						\
@@ -4778,6 +4802,8 @@
 
 operand indIndexScaledOffsetI(iRegP reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4792,6 +4818,8 @@
 
 operand indIndexScaledOffsetL(iRegP reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -4820,6 +4848,8 @@
 
 operand indIndexScaledOffsetI2L(iRegP reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP reg (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -4834,6 +4864,8 @@
 
 operand indIndexScaledI2L(iRegP reg, iRegI ireg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -4848,6 +4880,8 @@
 
 operand indIndexScaled(iRegP reg, iRegL lreg, immIScale scale)
 %{
+  predicate(size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP reg (LShiftL lreg scale));
   op_cost(0);
@@ -5003,7 +5037,9 @@
 
 operand indIndexScaledOffsetIN(iRegN reg, iRegL lreg, immIScale scale, immIU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(0);
@@ -5018,7 +5054,9 @@
 
 operand indIndexScaledOffsetLN(iRegN reg, iRegL lreg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL lreg scale)) off);
   op_cost(INSN_COST);
@@ -5048,7 +5086,9 @@
 
 operand indIndexScaledOffsetI2LN(iRegN reg, iRegI ireg, immIScale scale, immLU12 off)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Address)->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale)) off);
   op_cost(INSN_COST);
@@ -5063,7 +5103,9 @@
 
 operand indIndexScaledI2LN(iRegN reg, iRegI ireg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL (ConvI2L ireg) scale));
   op_cost(0);
@@ -5078,7 +5120,9 @@
 
 operand indIndexScaledN(iRegN reg, iRegL lreg, immIScale scale)
 %{
-  predicate(Universe::narrow_oop_shift() == 0);
+  predicate(Universe::narrow_oop_shift() == 0 &&
+            size_fits_all_mem_uses(n->as_AddP(),
+                                   n->in(AddPNode::Offset)->in(2)->get_int()));
   constraint(ALLOC_IN_RC(ptr_reg));
   match(AddP (DecodeN reg) (LShiftL lreg scale));
   op_cost(0);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/assembler_aarch64.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/assembler_aarch64.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/assembler_aarch64.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -1288,7 +1288,7 @@
 
   INSN(ldrs, 0b00, 1);
   INSN(ldrd, 0b01, 1);
-  INSN(ldrq, 0x10, 1);
+  INSN(ldrq, 0b10, 1);
 
 #undef INSN
 
@@ -1975,7 +1975,7 @@
  public:
 
   enum SIMD_Arrangement {
-       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D
+       T8B, T16B, T4H, T8H, T2S, T4S, T1D, T2D, T1Q
   };
 
   enum SIMD_RegVariant {
@@ -2306,14 +2306,16 @@
     f(0b001111, 15, 10), rf(Vn, 5), rf(Xd, 0);
   }
 
-  // We do not handle the 1Q arrangement.
   void pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
     starti;
-    assert(Ta == T8H && (Tb == T8B || Tb == T16B), "Invalid Size specifier");
-    f(0, 31), f(Tb & 1, 30), f(0b001110001, 29, 21), rf(Vm, 16), f(0b111000, 15, 10);
-    rf(Vn, 5), rf(Vd, 0);
+    assert((Ta == T1Q && (Tb == T1D || Tb == T2D)) ||
+           (Ta == T8H && (Tb == T8B || Tb == T16B)), "Invalid Size specifier");
+    int size = (Ta == T1Q) ? 0b11 : 0b00;
+    f(0, 31), f(Tb & 1, 30), f(0b001110, 29, 24), f(size, 23, 22);
+    f(1, 21), rf(Vm, 16), f(0b111000, 15, 10), rf(Vn, 5), rf(Vd, 0);
   }
   void pmull2(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
+    assert(Tb == T2D || Tb == T16B, "pmull2 assumes T2D or T16B as the second size specifier");
     pmull(Vd, Ta, Vn, Vm, Tb);
   }
 
@@ -2326,15 +2328,6 @@
     f(0b100001010010, 21, 10), rf(Vn, 5), rf(Vd, 0);
   }
 
-  void rev32(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn)
-  {
-    starti;
-    assert(T <= T8H, "must be one of T8B, T16B, T4H, T8H");
-    f(0, 31), f((int)T & 1, 30), f(0b101110, 29, 24);
-    f(T <= T16B ? 0b00 : 0b01, 23, 22), f(0b100000000010, 21, 10);
-    rf(Vn, 5), rf(Vd, 0);
-  }
-
   void dup(FloatRegister Vd, SIMD_Arrangement T, Register Xs)
   {
     starti;
@@ -2367,6 +2360,68 @@
 
 #undef INSN
 
+   // Table vector lookup
+#define INSN(NAME, op)                                                  \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, unsigned registers, FloatRegister Vm) { \
+    starti;                                                             \
+    assert(T == T8B || T == T16B, "invalid arrangement");               \
+    assert(0 < registers && registers <= 4, "invalid number of registers"); \
+    f(0, 31), f((int)T & 1, 30), f(0b001110000, 29, 21), rf(Vm, 16), f(0, 15); \
+    f(registers - 1, 14, 13), f(op, 12),f(0b00, 11, 10), rf(Vn, 5), rf(Vd, 0); \
+  }
+
+  INSN(tbl, 0);
+  INSN(tbx, 1);
+
+#undef INSN
+
+  // AdvSIMD two-reg misc
+#define INSN(NAME, U, opcode)                                                       \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {               \
+       starti;                                                                      \
+       assert((ASSERTION), MSG);                                                    \
+       f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24);                   \
+       f((int)(T >> 1), 23, 22), f(0b10000, 21, 17), f(opcode, 16, 12);             \
+       f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0);                                       \
+ }
+
+#define MSG "invalid arrangement"
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H || T == T2S || T == T4S)
+  INSN(rev64, 0, 0b00000);
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B || T == T4H || T == T8H)
+  INSN(rev32, 1, 0b00000);
+private:
+  INSN(_rbit, 1, 0b00101);
+public:
+
+#undef ASSERTION
+
+#define ASSERTION (T == T8B || T == T16B)
+  INSN(rev16, 0, 0b00001);
+  // RBIT only allows T8B and T16B but encodes them oddly.  Argh...
+  void rbit(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {
+    assert((ASSERTION), MSG);
+    _rbit(Vd, SIMD_Arrangement(T & 1 | 0b010), Vn);
+  }
+#undef ASSERTION
+
+#undef MSG
+
+#undef INSN
+
+ void ext(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm, int index)
+   {
+     starti;
+     assert(T == T8B || T == T16B, "invalid arrangement");
+     assert((T == T8B && index <= 0b0111) || (T == T16B && index <= 0b1111), "Invalid index value");
+     f(0, 31), f((int)T & 1, 30), f(0b101110000, 29, 21);
+     rf(Vm, 16), f(0, 15), f(index, 14, 11);
+     f(0, 10), rf(Vn, 5), rf(Vd, 0);
+   }
+
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
   }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -607,12 +607,12 @@
   } else {
     assert (x->op() == Bytecodes::_imul, "expect imul");
     if (right.is_constant()) {
-      int c = right.get_jint_constant();
-      if (! is_power_of_2(c) && ! is_power_of_2(c + 1) && ! is_power_of_2(c - 1)) {
-        // Cannot use constant op.
-        right.load_item();
+      jint c = right.get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+        right_arg->dont_load_item();
       } else {
-        right.dont_load_item();
+        // Cannot use constant op.
+        right_arg->load_item();
       }
     } else {
       right.load_item();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -145,9 +145,9 @@
 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
-    stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
+    stp(arg3, arg2, Address(pre(sp, -2 * wordSize)));
     stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
     ldp(c_rarg1, zr, Address(post(sp, 2 * wordSize)));
     ldp(c_rarg3, c_rarg2, Address(post(sp, 2 * wordSize)));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -645,6 +645,11 @@
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
 
+  // lr could be poisoned with PAC signature during throw_pending_exception
+  // if it was tail-call optimized by compiler, since lr is not callee-saved
+  // reload it with proper value
+  adr(lr, l);
+
   // reset last Java frame
   // Only interpreter should have to clear fp
   reset_last_Java_frame(true);
@@ -1263,7 +1268,7 @@
   stp(rscratch2, lr, Address(pre(sp, -2 * wordSize)));
 
   mov(r0, reg);
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -1299,7 +1304,7 @@
   } else {
     ldr(r0, addr);
   }
-  mov(rscratch1, (address)b);
+  movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
   lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
@@ -2000,8 +2005,8 @@
 void MacroAssembler::stop(const char* msg) {
   address ip = pc();
   pusha();
-  mov(c_rarg0, (address)msg);
-  mov(c_rarg1, (address)ip);
+  movptr(c_rarg0, (uintptr_t)(address)msg);
+  movptr(c_rarg1, (uintptr_t)(address)ip);
   mov(c_rarg2, sp);
   mov(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
   blr(c_rarg3);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013, Red Hat Inc.
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates.
  * All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1383,10 +1383,10 @@
       __ ldr(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ verify_oop(temp);
     } else {
-      __ ldrw(r16, Address(a, rscratch2, Address::lsl(exact_log2(size))));
+      __ ldrw(temp, Address(a, rscratch2, Address::lsl(exact_log2(size))));
       __ decode_heap_oop(temp); // calls verify_oop
     }
-    __ add(rscratch2, rscratch2, size);
+    __ add(rscratch2, rscratch2, 1);
     __ b(loop);
     __ bind(end);
   }
@@ -3220,6 +3220,69 @@
     return start;
   }
 
+  void ghash_multiply(FloatRegister result_lo, FloatRegister result_hi,
+                      FloatRegister a, FloatRegister b, FloatRegister a1_xor_a0,
+                      FloatRegister tmp1, FloatRegister tmp2, FloatRegister tmp3, FloatRegister tmp4) {
+    // Karatsuba multiplication performs a 128*128 -> 256-bit
+    // multiplication in three 128-bit multiplications and a few
+    // additions.
+    //
+    // (C1:C0) = A1*B1, (D1:D0) = A0*B0, (E1:E0) = (A0+A1)(B0+B1)
+    // (A1:A0)(B1:B0) = C1:(C0+C1+D1+E1):(D1+C0+D0+E0):D0
+    //
+    // Inputs:
+    //
+    // A0 in a.d[0]     (subkey)
+    // A1 in a.d[1]
+    // (A1+A0) in a1_xor_a0.d[0]
+    //
+    // B0 in b.d[0]     (state)
+    // B1 in b.d[1]
+
+    __ ext(tmp1, __ T16B, b, b, 0x08);
+    __ pmull2(result_hi, __ T1Q, b, a, __ T2D);  // A1*B1
+    __ eor(tmp1, __ T16B, tmp1, b);            // (B1+B0)
+    __ pmull(result_lo,  __ T1Q, b, a, __ T1D);  // A0*B0
+    __ pmull(tmp2, __ T1Q, tmp1, a1_xor_a0, __ T1D); // (A1+A0)(B1+B0)
+
+    __ ext(tmp4, __ T16B, result_lo, result_hi, 0x08);
+    __ eor(tmp3, __ T16B, result_hi, result_lo); // A1*B1+A0*B0
+    __ eor(tmp2, __ T16B, tmp2, tmp4);
+    __ eor(tmp2, __ T16B, tmp2, tmp3);
+
+    // Register pair <result_hi:result_lo> holds the result of carry-less multiplication
+    __ ins(result_hi, __ D, tmp2, 0, 1);
+    __ ins(result_lo, __ D, tmp2, 1, 0);
+  }
+
+  void ghash_reduce(FloatRegister result, FloatRegister lo, FloatRegister hi,
+                    FloatRegister p, FloatRegister z, FloatRegister t1) {
+    const FloatRegister t0 = result;
+
+    // The GCM field polynomial f is z^128 + p(z), where p =
+    // z^7+z^2+z+1.
+    //
+    //    z^128 === -p(z)  (mod (z^128 + p(z)))
+    //
+    // so, given that the product we're reducing is
+    //    a == lo + hi * z^128
+    // substituting,
+    //      === lo - hi * p(z)  (mod (z^128 + p(z)))
+    //
+    // we reduce by multiplying hi by p(z) and subtracting the result
+    // from (i.e. XORing it with) lo.  Because p has no nonzero high
+    // bits we can do this with two 64-bit multiplications, lo*p and
+    // hi*p.
+
+    __ pmull2(t0, __ T1Q, hi, p, __ T2D);
+    __ ext(t1, __ T16B, t0, z, 8);
+    __ eor(hi, __ T16B, hi, t1);
+    __ ext(t1, __ T16B, z, t0, 8);
+    __ eor(lo, __ T16B, lo, t1);
+    __ pmull(t0, __ T1Q, hi, p, __ T1D);
+    __ eor(result, __ T16B, lo, t0);
+  }
+
   /**
    *  Arguments:
    *
@@ -3260,6 +3323,93 @@
     return start;
   }
 
+  /**
+   *  Arguments:
+   *
+   *  Input:
+   *  c_rarg0   - current state address
+   *  c_rarg1   - H key address
+   *  c_rarg2   - data address
+   *  c_rarg3   - number of blocks
+   *
+   *  Output:
+   *  Updated state at c_rarg0
+   */
+  address generate_ghash_processBlocks() {
+    // Bafflingly, GCM uses little-endian for the byte order, but
+    // big-endian for the bit order.  For example, the polynomial 1 is
+    // represented as the 16-byte string 80 00 00 00 | 12 bytes of 00.
+    //
+    // So, we must either reverse the bytes in each word and do
+    // everything big-endian or reverse the bits in each byte and do
+    // it little-endian.  On AArch64 it's more idiomatic to reverse
+    // the bits in each byte (we have an instruction, RBIT, to do
+    // that) and keep the data in little-endian bit order throught the
+    // calculation, bit-reversing the inputs and outputs.
+
+    StubCodeMark mark(this, "StubRoutines", "ghash_processBlocks");
+    __ align(wordSize * 2);
+    address p = __ pc();
+    __ emit_int64(0x87);  // The low-order bits of the field
+                          // polynomial (i.e. p = z^7+z^2+z+1)
+                          // repeated in the low and high parts of a
+                          // 128-bit vector
+    __ emit_int64(0x87);
+
+    __ align(CodeEntryAlignment);
+    address start = __ pc();
+
+    Register state   = c_rarg0;
+    Register subkeyH = c_rarg1;
+    Register data    = c_rarg2;
+    Register blocks  = c_rarg3;
+
+    FloatRegister vzr = v30;
+    __ eor(vzr, __ T16B, vzr, vzr); // zero register
+
+    __ ldrq(v0, Address(state));
+    __ ldrq(v1, Address(subkeyH));
+
+    __ rev64(v0, __ T16B, v0);          // Bit-reverse words in state and subkeyH
+    __ rbit(v0, __ T16B, v0);
+    __ rev64(v1, __ T16B, v1);
+    __ rbit(v1, __ T16B, v1);
+
+    __ ldrq(v26, p);
+
+    __ ext(v16, __ T16B, v1, v1, 0x08); // long-swap subkeyH into v1
+    __ eor(v16, __ T16B, v16, v1);      // xor subkeyH into subkeyL (Karatsuba: (A1+A0))
+
+    {
+      Label L_ghash_loop;
+      __ bind(L_ghash_loop);
+
+      __ ldrq(v2, Address(__ post(data, 0x10))); // Load the data, bit
+                                                 // reversing each byte
+      __ rbit(v2, __ T16B, v2);
+      __ eor(v2, __ T16B, v0, v2);   // bit-swapped data ^ bit-swapped state
+
+      // Multiply state in v2 by subkey in v1
+      ghash_multiply(/*result_lo*/v5, /*result_hi*/v7,
+                     /*a*/v1, /*b*/v2, /*a1_xor_a0*/v16,
+                     /*temps*/v6, v20, v18, v21);
+      // Reduce v7:v5 by the field polynomial
+      ghash_reduce(v0, v5, v7, v26, vzr, v20);
+
+      __ sub(blocks, blocks, 1);
+      __ cbnz(blocks, L_ghash_loop);
+    }
+
+    // The bit-reversed result is at this point in v0
+    __ rev64(v1, __ T16B, v0);
+    __ rbit(v1, __ T16B, v1);
+
+    __ st1(v1, __ T16B, state);
+    __ ret(lr);
+
+    return start;
+  }
+
   // Continuation point for throwing of implicit exceptions that are
   // not handled in the current activation. Fabricates an exception
   // oop and initiates normal exception dispatching in this
@@ -4269,6 +4419,11 @@
       StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt();
     }
 
+    // generate GHASH intrinsics code
+    if (UseGHASHIntrinsics) {
+      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
+    }
+
     if (UseSHA1Intrinsics) {
       StubRoutines::_sha1_implCompress     = generate_sha1_implCompress(false,   "sha1_implCompress");
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true,    "sha1_implCompressMB");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/vm_version_aarch64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/vm_version_aarch64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/aarch64/vm/vm_version_aarch64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -41,6 +41,10 @@
 #define HWCAP_AES   (1<<3)
 #endif
 
+#ifndef HWCAP_PMULL
+#define HWCAP_PMULL (1<<4)
+#endif
+
 #ifndef HWCAP_SHA1
 #define HWCAP_SHA1  (1<<5)
 #endif
@@ -138,6 +142,17 @@
     if (PrefetchCopyIntervalInBytes >= 32768)
       PrefetchCopyIntervalInBytes = 32760;
   }
+
+  if (AllocatePrefetchDistance !=-1 && (AllocatePrefetchDistance & 7)) {
+    warning("AllocatePrefetchDistance must be multiple of 8");
+    AllocatePrefetchDistance &= ~7;
+  }
+
+  if (AllocatePrefetchStepSize & 7) {
+    warning("AllocatePrefetchStepSize must be multiple of 8");
+    AllocatePrefetchStepSize &= ~7;
+  }
+
   FLAG_SET_DEFAULT(UseSSE42Intrinsics, true);
 
   unsigned long auxv = getauxval(AT_HWCAP);
@@ -226,7 +241,11 @@
     }
   }
 
-  if (UseGHASHIntrinsics) {
+  if (auxv & HWCAP_PMULL) {
+    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, true);
+    }
+  } else if (UseGHASHIntrinsics) {
     warning("GHASH intrinsics are not available on this CPU");
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/ppc/vm/frame_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/ppc/vm/frame_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/ppc/vm/frame_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/ppc/vm/frame_ppc.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -67,8 +67,8 @@
     return false;
   }
 
-  // Unextended sp must be within the stack and above or equal sp
-  bool unextended_sp_safe = (unextended_sp < thread->stack_base()) && (unextended_sp >= sp);
+  // Unextended sp must be within the stack
+  bool unextended_sp_safe = (unextended_sp < thread->stack_base());
 
   if (!unextended_sp_safe) {
     return false;
@@ -76,9 +76,10 @@
 
   // An fp must be within the stack and above (but not equal) sp.
   bool fp_safe = (fp <= thread->stack_base()) &&  (fp > sp);
-  // an interpreter fp must be within the stack and above (but not equal) sp
-  bool fp_interp_safe = (fp <= thread->stack_base()) &&  (fp > sp) &&
-    ((fp - sp) >= (ijava_state_size + top_ijava_frame_abi_size));
+  // An interpreter fp must be within the stack and above (but not equal) sp.
+  // Moreover, it must be at least the size of the ijava_state structure.
+  bool fp_interp_safe = (fp <= thread->stack_base()) && (fp > sp) &&
+    ((fp - sp) >= ijava_state_size);
 
   // We know sp/unextended_sp are safe, only fp is questionable here
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/sparc/vm/assembler_sparc.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/sparc/vm/assembler_sparc.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/sparc/vm/assembler_sparc.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -363,6 +363,13 @@
     return is_in_wdisp_range(a, b, 30);
   }
 
+  static bool is_simm5(intptr_t x) { return is_simm(x, 5); }
+  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
+  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
+  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
+
+  static int min_simm13() { return -4096; }
+
   enum ASIs { // page 72, v9
     ASI_PRIMARY            = 0x80,
     ASI_PRIMARY_NOFAULT    = 0x82,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/x86/vm/c1_Runtime1_x86.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/x86/vm/c1_Runtime1_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -173,8 +173,8 @@
 #ifdef _LP64
   // if there is any conflict use the stack
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
-      arg2 == c_rarg1 || arg1 == c_rarg3 ||
-      arg3 == c_rarg1 || arg1 == c_rarg2) {
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
     push(arg3);
     push(arg2);
     push(arg1);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/x86/vm/templateTable_x86_64.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/x86/vm/templateTable_x86_64.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/cpu/x86/vm/templateTable_x86_64.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -110,10 +110,6 @@
   return Address(rsp,  Interpreter::expr_offset_in_bytes(2));
 }
 
-static inline Address at_tos_p3() {
-  return Address(rsp,  Interpreter::expr_offset_in_bytes(3));
-}
-
 // Condition conversion
 static Assembler::Condition j_not(TemplateTable::Condition cc) {
   switch (cc) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os/aix/vm/decoder_aix.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os/aix/vm/decoder_aix.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os/aix/vm/decoder_aix.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os/aix/vm/decoder_aix.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -32,7 +32,7 @@
   AIXDecoder() {
     _decoder_status = no_error;
   }
-  ~AIXDecoder() {}
+  virtual ~AIXDecoder() {}
 
   virtual bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os/bsd/vm/decoder_machO.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os/bsd/vm/decoder_machO.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os/bsd/vm/decoder_machO.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os/bsd/vm/decoder_machO.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -34,7 +34,7 @@
 class MachODecoder : public AbstractDecoder {
  public:
   MachODecoder() { }
-  ~MachODecoder() { }
+  virtual ~MachODecoder() { }
   virtual bool can_decode_C_frame_in_vm() const {
     return true;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os/windows/vm/decoder_windows.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os/windows/vm/decoder_windows.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os/windows/vm/decoder_windows.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os/windows/vm/decoder_windows.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -56,7 +56,7 @@
 
 public:
   WindowsDecoder();
-  ~WindowsDecoder() { uninitialize(); };
+  virtual ~WindowsDecoder() { uninitialize(); };
 
   bool can_decode_C_frame_in_vm() const;
   bool demangle(const char* symbol, char *buf, int buflen);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -178,7 +178,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Aix::chained_handler(sig, info, ucVoid)) {
       return 1;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -846,7 +846,7 @@
   *size = pthread_get_stacksize_np(self);
   // workaround for OS X 10.9.0 (Mavericks)
   // pthread_get_stacksize_np returns 128 pages even though the actual size is 2048 pages
-  if (pthread_main_np() == 1) {
+  if (::pthread_main_np() == 1) {
     if ((*size) < (DEFAULT_MAIN_THREAD_STACK_PAGES * (size_t)getpagesize())) {
       char kern_osrelease[256];
       size_t kern_osrelease_size = sizeof(kern_osrelease);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -185,7 +185,7 @@
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 
-  if (sig == SIGPIPE) {
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
     if (os::Linux::chained_handler(sig, info, ucVoid)) {
       return true;
     } else {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -51,21 +51,22 @@
     }
 
     if (ret_frame.is_interpreted_frame()) {
-       frame::ijava_state* istate = ret_frame.get_ijava_state();
-       if (!((Method*)(istate->method))->is_metaspace_object()) {
-         return false;
-       }
-       uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
-       uint64_t istate_bcp = istate->bcp;
-       uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
-       uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
-       if (istate_bcp >= code_start && istate_bcp < code_end) {
-         // we have a valid bcp, don't touch it, do nothing
-       } else if (reg_bcp >= code_start && reg_bcp < code_end) {
-         istate->bcp = reg_bcp;
+      frame::ijava_state *istate = ret_frame.get_ijava_state();
+      const Method *m = (const Method*)(istate->method);
+      if (m == NULL || !m->is_valid_method()) return false;
+      if (!Metaspace::contains((const void*)m)) return false;
+
+      uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
+      uint64_t istate_bcp = istate->bcp;
+      uint64_t code_start = (uint64_t)(m->code_base());
+      uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
+      if (istate_bcp >= code_start && istate_bcp < code_end) {
+        // we have a valid bcp, don't touch it, do nothing
+      } else if (reg_bcp >= code_start && reg_bcp < code_end) {
+        istate->bcp = reg_bcp;
       } else {
-         return false;
-       }
+        return false;
+      }
     }
     if (!ret_frame.safe_for_sender(this)) {
       // nothing else to try if the frame isn't good
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/tools/hsdis/hsdis.c openjdk-8-8u312-b07/=unpacked-tar4=/src/share/tools/hsdis/hsdis.c
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/tools/hsdis/hsdis.c	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/tools/hsdis/hsdis.c	2021-10-15 03:03:52.000000000 +0000
@@ -150,15 +150,15 @@
                     event_callback_t  event_callback_arg,  void* event_stream_arg,
                     printf_callback_t printf_callback_arg, void* printf_stream_arg,
                     const char* options) {
-  decode_instructions_virtual((uintptr_t)start_pv,
-                             (uintptr_t)end_pv,
-                             (unsigned char*)start_pv,
-                             (uintptr_t)end_pv - (uintptr_t)start_pv,
-                             event_callback_arg,
-                             event_stream_arg,
-                             printf_callback_arg,
-                             printf_stream_arg,
-                             options, false);
+  return decode_instructions_virtual((uintptr_t)start_pv,
+                                     (uintptr_t)end_pv,
+                                     (unsigned char*)start_pv,
+                                     (uintptr_t)end_pv - (uintptr_t)start_pv,
+                                     event_callback_arg,
+                                     event_stream_arg,
+                                     printf_callback_arg,
+                                     printf_stream_arg,
+                                     options, false);
 }
 
 static void* decode(struct hsdis_app_data* app_data, const char* options) {
@@ -237,6 +237,7 @@
   case dis_condjsr:     type = "condjsr";    break;
   case dis_dref:        type = "dref";       break;
   case dis_dref2:       type = "dref2";      break;
+  case dis_noninsn:     type = "noninsn";    break;
   }
 
   strcpy(buf, close);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/adlc/formssel.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/adlc/formssel.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/adlc/formssel.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/adlc/formssel.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -3383,7 +3383,7 @@
 // Count occurrences of operands names in the leaves of the instruction
 // match rule.
 void MatchNode::count_instr_names( Dict &names ) {
-  if( !this ) return;
+  if( this == NULL ) return;
   if( _lChild ) _lChild->count_instr_names(names);
   if( _rChild ) _rChild->count_instr_names(names);
   if( !_lChild && !_rChild ) {
@@ -3957,40 +3957,13 @@
 }
 
 int MatchRule::is_ideal_copy() const {
-  if( _rChild ) {
-    const char  *opType = _rChild->_opType;
-#if 1
-    if( strcmp(opType,"CastIP")==0 )
-      return 1;
-#else
-    if( strcmp(opType,"CastII")==0 )
-      return 1;
-    // Do not treat *CastPP this way, because it
-    // may transfer a raw pointer to an oop.
-    // If the register allocator were to coalesce this
-    // into a single LRG, the GC maps would be incorrect.
-    //if( strcmp(opType,"CastPP")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CheckCastPP")==0 )
-    //  return 1;
-    //
-    // Do not treat CastX2P or CastP2X this way, because
-    // raw pointers and int types are treated differently
-    // when saving local & stack info for safepoints in
-    // Output().
-    //if( strcmp(opType,"CastX2P")==0 )
-    //  return 1;
-    //if( strcmp(opType,"CastP2X")==0 )
-    //  return 1;
-#endif
-  }
-  if( is_chain_rule(_AD.globalNames()) &&
-      _lChild && strncmp(_lChild->_opType,"stackSlot",9)==0 )
+  if (is_chain_rule(_AD.globalNames()) &&
+      _lChild && strncmp(_lChild->_opType, "stackSlot", 9) == 0) {
     return 1;
+  }
   return 0;
 }
 
-
 int MatchRule::is_expensive() const {
   if( _rChild ) {
     const char  *opType = _rChild->_opType;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/adlc/output_h.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/adlc/output_h.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/adlc/output_h.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/adlc/output_h.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2158,7 +2158,9 @@
 public:
   OutputMachOpcodes(FILE *hpp, FILE *cpp, FormDict &globals, ArchDesc &AD)
     : OutputMap(hpp, cpp, globals, AD, "MachOpcodes"),
-      begin_inst_chain_rule(-1), end_inst_chain_rule(-1), end_instructions(-1)
+      begin_inst_chain_rule(-1), end_inst_chain_rule(-1),
+      begin_rematerialize(-1), end_rematerialize(-1),
+      end_instructions(-1)
   {};
 
   void declaration() { }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/asm/assembler.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/asm/assembler.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/asm/assembler.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/asm/assembler.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -294,28 +294,29 @@
   void emit_double( jdouble x) { code_section()->emit_double( x); }
   void emit_address(address x) { code_section()->emit_address(x); }
 
-  // min and max values for signed immediate ranges
-  static int min_simm(int nbits) { return -(intptr_t(1) << (nbits - 1))    ; }
-  static int max_simm(int nbits) { return  (intptr_t(1) << (nbits - 1)) - 1; }
-
-  // Define some:
-  static int min_simm10() { return min_simm(10); }
-  static int min_simm13() { return min_simm(13); }
-  static int min_simm16() { return min_simm(16); }
-
-  // Test if x is within signed immediate range for nbits
-  static bool is_simm(intptr_t x, int nbits) { return min_simm(nbits) <= x && x <= max_simm(nbits); }
-
-  // Define some:
-  static bool is_simm5( intptr_t x) { return is_simm(x, 5 ); }
-  static bool is_simm8( intptr_t x) { return is_simm(x, 8 ); }
-  static bool is_simm10(intptr_t x) { return is_simm(x, 10); }
-  static bool is_simm11(intptr_t x) { return is_simm(x, 11); }
-  static bool is_simm12(intptr_t x) { return is_simm(x, 12); }
-  static bool is_simm13(intptr_t x) { return is_simm(x, 13); }
-  static bool is_simm16(intptr_t x) { return is_simm(x, 16); }
-  static bool is_simm26(intptr_t x) { return is_simm(x, 26); }
-  static bool is_simm32(intptr_t x) { return is_simm(x, 32); }
+  enum { min_simm10 = -512 };
+
+  // Test if x is within signed immediate range for width.
+  static bool is_simm(int64_t x, uint w) {
+    precond(1 < w && w < 64);
+    int64_t limes = INT64_C(1) << (w - 1);
+    return -limes <= x && x < limes;
+  }
+
+  static bool is_simm8(int64_t x) { return is_simm(x, 8); }
+  static bool is_simm9(int64_t x) { return is_simm(x, 9); }
+  static bool is_simm10(int64_t x) { return is_simm(x, 10); }
+  static bool is_simm16(int64_t x) { return is_simm(x, 16); }
+  static bool is_simm32(int64_t x) { return is_simm(x, 32); }
+
+  // Test if x is within unsigned immediate range for width.
+  static bool is_uimm(uint64_t x, uint w) {
+    precond(0 < w && w < 64);
+    uint64_t limes = UINT64_C(1) << w;
+    return x < limes;
+  }
+
+  static bool is_uimm12(uint64_t x) { return is_uimm(x, 12); }
 
   // Accessors
   CodeSection*  code_section() const   { return _code_section; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_Instruction.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_Instruction.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_Instruction.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_Instruction.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -2124,11 +2124,11 @@
   // creation
   TableSwitch(Value tag, BlockList* sux, int lo_key, ValueStack* state_before, bool is_safepoint)
     : Switch(tag, sux, state_before, is_safepoint)
-  , _lo_key(lo_key) {}
+  , _lo_key(lo_key) { assert(_lo_key <= hi_key(), "integer overflow"); }
 
   // accessors
   int lo_key() const                             { return _lo_key; }
-  int hi_key() const                             { return _lo_key + length() - 1; }
+  int hi_key() const                             { return _lo_key + (length() - 1); }
 };
 
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_IR.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_IR.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_IR.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_IR.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -578,11 +578,8 @@
     assert(is_visited(cur), "block must be visisted when block is active");
     assert(parent != NULL, "must have parent");
 
-    cur->set(BlockBegin::linear_scan_loop_header_flag);
     cur->set(BlockBegin::backward_branch_target_flag);
 
-    parent->set(BlockBegin::linear_scan_loop_end_flag);
-
     // When a loop header is also the start of an exception handler, then the backward branch is
     // an exception edge. Because such edges are usually critical edges which cannot be split, the
     // loop must be excluded here from processing.
@@ -591,6 +588,10 @@
       _iterative_dominators = true;
       return;
     }
+
+    cur->set(BlockBegin::linear_scan_loop_header_flag);
+    parent->set(BlockBegin::linear_scan_loop_end_flag);
+
     assert(parent->number_of_sux() == 1 && parent->sux_at(0) == cur,
            "loop end blocks must have one successor (critical edges are split)");
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_LIRGenerator.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_LIRGenerator.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_LIRGenerator.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2576,8 +2576,8 @@
   move_to_phi(x->state());
 
   int lo_key = x->lo_key();
-  int hi_key = x->hi_key();
   int len = x->length();
+  assert(lo_key <= (lo_key + (len - 1)), "integer overflow");
   LIR_Opr value = tag.result();
   if (UseTableRanges) {
     do_SwitchRanges(create_lookup_ranges(x), value, x->default_sux());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_RangeCheckElimination.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_RangeCheckElimination.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_RangeCheckElimination.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -971,7 +971,7 @@
           } else {
             // Has no upper bound
             Instruction *instr = ai->length();
-            if (instr != NULL) instr = ai->array();
+            if (instr == NULL) instr = ai->array();
             update_bound(pushed, ai->index(), Instruction::lss, instr, 0);
           }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_Runtime1.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_Runtime1.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_Runtime1.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_Runtime1.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -987,6 +987,7 @@
         address copy_buff = stub_location - *byte_skip - *byte_count;
         address being_initialized_entry = stub_location - *being_initialized_entry_offset;
         if (TracePatching) {
+          ttyLocker ttyl;
           tty->print_cr(" Patching %s at bci %d at address " INTPTR_FORMAT "  (%s)", Bytecodes::name(code), bci,
                         p2i(instr_pc), (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
           nmethod* caller_code = CodeCache::find_nmethod(caller_frame.pc());
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_ValueMap.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_ValueMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/c1/c1_ValueMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/c1/c1_ValueMap.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -328,7 +328,7 @@
 };
 
 LoopInvariantCodeMotion::LoopInvariantCodeMotion(ShortLoopOptimizer *slo, GlobalValueNumbering* gvn, BlockBegin* loop_header, BlockList* loop_blocks)
-  : _gvn(gvn), _short_loop_optimizer(slo) {
+  : _gvn(gvn), _short_loop_optimizer(slo), _insertion_point(NULL), _state(NULL), _insert_is_pred(false) {
 
   TRACE_VALUE_NUMBERING(tty->print_cr("using loop invariant code motion loop_header = %d", loop_header->block_id()));
   TRACE_VALUE_NUMBERING(tty->print_cr("** loop invariant code motion for short loop B%d", loop_header->block_id()));
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classFileParser.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classFileParser.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classFileParser.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classFileParser.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2801,8 +2801,7 @@
     // Inner class index
     u2 inner_class_info_index = cfs->get_u2_fast();
     check_property(
-      inner_class_info_index == 0 ||
-        valid_klass_reference_at(inner_class_info_index),
+      valid_klass_reference_at(inner_class_info_index),
       "inner_class_info_index %u has bad constant type in class file %s",
       inner_class_info_index, CHECK_0);
     // Outer class index
@@ -2812,6 +2811,13 @@
         valid_klass_reference_at(outer_class_info_index),
       "outer_class_info_index %u has bad constant type in class file %s",
       outer_class_info_index, CHECK_0);
+
+    if (outer_class_info_index != 0) {
+      const Symbol* const outer_class_name = cp->klass_name_at(outer_class_info_index);
+      char* bytes = (char*)outer_class_name->bytes();
+      guarantee_property(bytes[0] != JVM_SIGNATURE_ARRAY,
+                         "Outer class is an array class in class file %s", CHECK_0);
+    }
     // Inner class name
     u2 inner_name_index = cfs->get_u2_fast();
     check_property(
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classFileParser.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classFileParser.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classFileParser.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classFileParser.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -139,7 +139,7 @@
     u2 _contended_group;
 
     AnnotationCollector(Location location)
-    : _location(location), _annotations_present(0)
+    : _location(location), _annotations_present(0), _contended_group(0)
     {
       assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classLoader.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classLoader.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/classLoader.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/classLoader.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -39,7 +39,7 @@
   int    _num_meta_package_names;
  public:
   MetaIndex(char** meta_package_names, int num_meta_package_names);
-  ~MetaIndex();
+  virtual ~MetaIndex();
   bool may_contain(const char* class_name);
 };
 
@@ -61,6 +61,7 @@
   virtual bool is_lazy();
   // Constructor
   ClassPathEntry();
+  virtual ~ClassPathEntry() {}
   // Attempt to locate file_name through this class path entry.
   // Returns a class file parsing stream if successfull.
   virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
@@ -77,6 +78,7 @@
   bool is_jar_file()  { return false;  }
   const char* name()  { return _dir; }
   ClassPathDirEntry(const char* dir);
+  virtual ~ClassPathDirEntry() {}
   ClassFileStream* open_stream(const char* name, TRAPS);
   // Debugging
   NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
@@ -106,7 +108,7 @@
   bool is_jar_file()  { return true;  }
   const char* name()  { return _zip_name; }
   ClassPathZipEntry(jzfile* zip, const char* zip_name);
-  ~ClassPathZipEntry();
+  virtual ~ClassPathZipEntry();
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void contents_do(void f(const char* name, void* context), void* context);
@@ -134,6 +136,7 @@
   bool is_jar_file();
   const char* name()  { return _path; }
   LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception);
+  virtual ~LazyClassPathEntry() {}
   u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
   ClassFileStream* open_stream(const char* name, TRAPS);
   void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/javaClasses.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/javaClasses.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/javaClasses.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/javaClasses.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1454,9 +1454,9 @@
       method = mhandle();
     }
 
-    _methods->short_at_put(_index, method->orig_method_idnum());
+    _methods->ushort_at_put(_index, method->orig_method_idnum());
     _bcis->int_at_put(_index, merge_bci_and_version(bci, method->constants()->version()));
-    _cprefs->short_at_put(_index, method->name_index());
+    _cprefs->ushort_at_put(_index, method->name_index());
 
     // We need to save the mirrors in the backtrace to keep the class
     // from being unloaded while we still have this stack trace.
@@ -1573,10 +1573,10 @@
         Handle mirror(THREAD, mirrors->obj_at(index));
         // NULL mirror means end of stack trace
         if (mirror.is_null()) goto handle_cause;
-        int method = methods->short_at(index);
+        int method = methods->ushort_at(index);
         int version = version_at(bcis->int_at(index));
         int bci = bci_at(bcis->int_at(index));
-        int cpref = cprefs->short_at(index);
+        int cpref = cprefs->ushort_at(index);
         print_stack_element(st, mirror, method, version, bci, cpref);
       }
       result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
@@ -1869,10 +1869,10 @@
 
   assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check");
 
-  int method = methods->short_at(chunk_index);
+  int method = methods->ushort_at(chunk_index);
   int version = version_at(bcis->int_at(chunk_index));
   int bci = bci_at(bcis->int_at(chunk_index));
-  int cpref = cprefs->short_at(chunk_index);
+  int cpref = cprefs->ushort_at(chunk_index);
   Handle mirror(THREAD, mirrors->obj_at(chunk_index));
 
   // Chunk can be partial full
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/verifier.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/verifier.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/classfile/verifier.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/classfile/verifier.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2142,6 +2142,7 @@
   // Get field name and signature
   Symbol* field_name = cp->name_ref_at(index);
   Symbol* field_sig = cp->signature_ref_at(index);
+  bool is_getfield = false;
 
   if (!SignatureVerifier::is_valid_type_signature(field_sig)) {
     class_format_error(
@@ -2192,11 +2193,9 @@
       break;
     }
     case Bytecodes::_getfield: {
+      is_getfield = true;
       stack_object_type = current_frame->pop_stack(
         target_class_type, CHECK_VERIFY(this));
-      for (int i = 0; i < n; i++) {
-        current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
-      }
       goto check_protected;
     }
     case Bytecodes::_putfield: {
@@ -2226,6 +2225,15 @@
     check_protected: {
       if (_this_type == stack_object_type)
         break; // stack_object_type must be assignable to _current_class_type
+      if (was_recursively_verified()) {
+        if (is_getfield) {
+          // Push field type for getfield.
+          for (int i = 0; i < n; i++) {
+            current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+          }
+        }
+        return;
+      }
       Symbol* ref_class_name =
         cp->klass_name_at(cp->klass_ref_index_at(index));
       if (!name_in_supers(ref_class_name, current_class()))
@@ -2254,6 +2262,12 @@
     }
     default: ShouldNotReachHere();
   }
+  if (is_getfield) {
+    // Push field type for getfield after doing protection check.
+    for (int i = 0; i < n; i++) {
+      current_frame->push_stack(field_type[i], CHECK_VERIFY(this));
+    }
+  }
 }
 
 // Look at the method's handlers.  If the bci is in the handler's try block
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/codeBlob.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/codeBlob.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/codeBlob.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/codeBlob.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -198,6 +198,11 @@
   return oop_maps()->find_map_at_offset((intptr_t) return_address - (intptr_t) code_begin());
 }
 
+void CodeBlob::print_code() {
+  HandleMark hm;
+  ResourceMark m;
+  Disassembler::decode(this, tty);
+}
 
 //----------------------------------------------------------------------------------------------------
 // Implementation of BufferBlob
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/codeBlob.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/codeBlob.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/codeBlob.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/codeBlob.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -190,6 +190,7 @@
   void print() const                             { print_on(tty); }
   virtual void print_on(outputStream* st) const;
   virtual void print_value_on(outputStream* st) const;
+  void print_code();
 
   // Deal with Disassembler, VTune, Forte, JvmtiExport, MemoryService.
   static void trace_new_stub(CodeBlob* blob, const char* name1, const char* name2 = "");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/dependencies.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/dependencies.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/dependencies.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/dependencies.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -969,9 +969,9 @@
   // the spot-checking version:
   Klass* find_witness_in(KlassDepChange& changes,
                          Klass* context_type,
-                           bool participants_hide_witnesses);
-  bool witnessed_reabstraction_in_supers(Klass* k);
+                         bool participants_hide_witnesses);
  public:
+  bool witnessed_reabstraction_in_supers(Klass* k);
   Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) {
     assert(doing_subtype_search(), "must set up a subtype search");
     // When looking for unexpected concrete types,
@@ -1082,15 +1082,8 @@
     }
   }
 
-  if (is_witness(new_type)) {
-    if (!ignore_witness(new_type)) {
-      return new_type;
-    }
-  } else if (!doing_subtype_search()) {
-    // No witness found, but is_witness() doesn't detect method re-abstraction in case of spot-checking.
-    if (witnessed_reabstraction_in_supers(new_type)) {
-      return new_type;
-    }
+  if (is_witness(new_type) && !ignore_witness(new_type)) {
+    return new_type;
   }
 
   return NULL;
@@ -1475,16 +1468,109 @@
   return num;
 }
 
+
+// Try to determine whether root method in some context is concrete or not based on the information about the unique method
+// in that context. It exploits the fact that concrete root method is always inherited into the context when there's a unique method.
+// Hence, unique method holder is always a supertype of the context class when root method is concrete.
+// Examples for concrete_root_method
+//      C (C.m uniqm)
+//      |
+//      CX (ctxk) uniqm is inherited into context.
+//
+//      CX (ctxk) (CX.m uniqm) here uniqm is defined in ctxk.
+// Examples for !concrete_root_method
+//      CX (ctxk)
+//      |
+//      C (C.m uniqm) uniqm is in subtype of ctxk.
+bool Dependencies::is_concrete_root_method(Method* uniqm, Klass* ctxk) {
+  if (uniqm == NULL) {
+    return false; // match Dependencies::is_concrete_method() behavior
+  }
+  // Theoretically, the "direction" of subtype check matters here.
+  // On one hand, in case of interface context with a single implementor, uniqm can be in a superclass of the implementor which
+  // is not related to context class.
+  // On another hand, uniqm could come from an interface unrelated to the context class, but right now it is not possible:
+  // it is required that uniqm->method_holder() is the participant (uniqm->method_holder() <: ctxk), hence a default method
+  // can't be used as unique.
+  if (ctxk->is_interface()) {
+    Klass* implementor = InstanceKlass::cast(ctxk)->implementor();
+    assert(implementor != ctxk, "single implementor only"); // should have been invalidated earlier
+    ctxk = implementor;
+  }
+  InstanceKlass* holder = uniqm->method_holder();
+  assert(!holder->is_interface(), "no default methods allowed");
+  assert(ctxk->is_subclass_of(holder) || holder->is_subclass_of(ctxk), "not related");
+  return ctxk->is_subclass_of(holder);
+}
+
 // If a class (or interface) has a unique concrete method uniqm, return NULL.
 // Otherwise, return a class that contains an interfering method.
-Klass* Dependencies::check_unique_concrete_method(Klass* ctxk, Method* uniqm,
-                                                    KlassDepChange* changes) {
-  // Here is a missing optimization:  If uniqm->is_final(),
-  // we don't really need to search beneath it for overrides.
-  // This is probably not important, since we don't use dependencies
-  // to track final methods.  (They can't be "definalized".)
+Klass* Dependencies::check_unique_concrete_method(Klass* ctxk,
+                                                  Method* uniqm,
+                                                  KlassDepChange* changes) {
   ClassHierarchyWalker wf(uniqm->method_holder(), uniqm);
-  return wf.find_witness_definer(ctxk, changes);
+  Klass* witness = wf.find_witness_definer(ctxk, changes);
+  if (witness != NULL) {
+    return witness;
+  }
+  if (!Dependencies::is_concrete_root_method(uniqm, ctxk) || changes != NULL) {
+    Klass* conck = find_witness_AME(ctxk, uniqm, changes);
+    if (conck != NULL) {
+      // Found a concrete subtype 'conck' which does not override abstract root method.
+      return conck;
+    }
+  }
+  return NULL;
+}
+
+// Search for AME.
+// There are two version of checks.
+//   1) Spot checking version(Classload time). Newly added class is checked for AME.
+//      Checks whether abstract/overpass method is inherited into/declared in newly added concrete class.
+//   2) Compile time analysis for abstract/overpass(abstract klass) root_m. The non uniqm subtrees are checked for concrete classes.
+Klass* Dependencies::find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes) {
+  if (m != NULL) {
+    if (changes != NULL) {
+      // Spot checking version.
+      ClassHierarchyWalker wf(m);
+      Klass* new_type = changes->new_type();
+      if (wf.witnessed_reabstraction_in_supers(new_type)) {
+        return new_type;
+      }
+    } else {
+      // Note: It is required that uniqm->method_holder() is the participant (see ClassHierarchyWalker::found_method()).
+      ClassHierarchyWalker wf(m->method_holder());
+      Klass* conck = wf.find_witness_subtype(ctxk);
+      if (conck != NULL) {
+        Method* cm = InstanceKlass::cast(conck)->find_instance_method(m->name(), m->signature(), Klass::skip_private);
+        if (!Dependencies::is_concrete_method(cm, conck)) {
+          return conck;
+        }
+      }
+    }
+  }
+  return NULL;
+}
+
+// This function is used by find_unique_concrete_method(non vtable based)
+// to check whether subtype method overrides the base method.
+static bool overrides(Method* sub_m, Method* base_m) {
+  assert(base_m != NULL, "base method should be non null");
+  if (sub_m == NULL) {
+    return false;
+  }
+  /**
+   *  If base_m is public or protected then sub_m always overrides.
+   *  If base_m is !public, !protected and !private (i.e. base_m is package private)
+   *  then sub_m should be in the same package as that of base_m.
+   *  For package private base_m this is conservative approach as it allows only subset of all allowed cases in
+   *  the jvm specification.
+   **/
+  if (base_m->is_public() || base_m->is_protected() ||
+      base_m->method_holder()->is_same_class_package(sub_m->method_holder())) {
+    return true;
+  }
+  return false;
 }
 
 // Find the set of all non-abstract methods under ctxk that match m.
@@ -1507,7 +1593,14 @@
       // (This can happen if m is inherited into ctxk and fm overrides it.)
       return NULL;
     }
+  } else if (Dependencies::find_witness_AME(ctxk, fm) != NULL) {
+    // Found a concrete subtype which does not override abstract root method.
+    return NULL;
+  } else if (!overrides(fm, m)) {
+    // Found method doesn't override abstract root method.
+    return NULL;
   }
+  assert(Dependencies::is_concrete_root_method(fm, ctxk) == Dependencies::is_concrete_method(m, ctxk), "mismatch");
 #ifndef PRODUCT
   // Make sure the dependency mechanism will pass this discovery:
   if (VerifyDependencies && fm != NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/dependencies.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/dependencies.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/dependencies.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/dependencies.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -290,6 +290,9 @@
   static bool is_concrete_method(Method* m, Klass* k);  // m is invocable
   static Klass* find_finalizable_subclass(Klass* k);
 
+  static bool is_concrete_root_method(Method* uniqm, Klass* ctxk);
+  static Klass* find_witness_AME(Klass* ctxk, Method* m, KlassDepChange* changes = NULL);
+
   // These versions of the concreteness queries work through the CI.
   // The CI versions are allowed to skew sometimes from the VM
   // (oop-based) versions.  The cost of such a difference is a
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/nmethod.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/nmethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/nmethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/nmethod.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2612,6 +2612,7 @@
     ResourceMark rm(thread);
     CodeBlob* cb = CodeCache::find_blob(pc);
     assert(cb != NULL && cb == this, "");
+    ttyLocker ttyl;
     tty->print_cr("implicit exception happened at " INTPTR_FORMAT, pc);
     print();
     method()->print_codes();
@@ -2933,13 +2934,6 @@
                                               nul_chk_table_size());
 }
 
-void nmethod::print_code() {
-  HandleMark hm;
-  ResourceMark m;
-  Disassembler::decode(this);
-}
-
-
 #ifndef PRODUCT
 
 void nmethod::print_scopes() {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/nmethod.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/nmethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/code/nmethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/code/nmethod.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -695,7 +695,6 @@
 
   // printing support
   void print()                          const;
-  void print_code();
   void print_relocations()                        PRODUCT_RETURN;
   void print_pcs()                                PRODUCT_RETURN;
   void print_scopes()                             PRODUCT_RETURN;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/compiler/disassembler.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/compiler/disassembler.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/compiler/disassembler.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/compiler/disassembler.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -89,7 +89,7 @@
   {
     // Match "jvm[^/]*" in jvm_path.
     const char* base = buf;
-    const char* p = strrchr(buf, '/');
+    const char* p = strrchr(buf, *os::file_separator());
     if (p != NULL) lib_offset = p - base + 1;
     p = strstr(p ? p : base, "jvm");
     if (p != NULL)  jvm_offset = p - base;
@@ -114,7 +114,7 @@
     if (_library == NULL) {
       // 3. <home>/jre/lib/<arch>/hsdis-<arch>.so
       buf[lib_offset - 1] = '\0';
-      const char* p = strrchr(buf, '/');
+      const char* p = strrchr(buf, *os::file_separator());
       if (p != NULL) {
         lib_offset = p - buf + 1;
         strcpy(&buf[lib_offset], hsdis_library_name);
@@ -504,6 +504,7 @@
 
 
 void Disassembler::decode(CodeBlob* cb, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(cb, st);
   env.output()->print_cr("Decoding CodeBlob " PTR_FORMAT, cb);
@@ -511,12 +512,14 @@
 }
 
 void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(CodeCache::find_blob_unsafe(start), st, c);
   env.decode_instructions(start, end);
 }
 
 void Disassembler::decode(nmethod* nm, outputStream* st) {
+  ttyLocker ttyl;
   if (!load_library())  return;
   decode_env env(nm, st);
   env.output()->print_cr("Decoding compiled method " PTR_FORMAT ":", nm);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#if !defined(__clang_major__) && defined(__GNUC__)
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "classfile/metadataOnStackMark.hpp"
 #include "code/codeCache.hpp"
@@ -232,7 +228,7 @@
     if (!curr->is_young()) {
       gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
                              "incorrectly tagged (y: %d, surv: %d)",
-                             curr->bottom(), curr->end(),
+                             p2i(curr->bottom()), p2i(curr->end()),
                              curr->is_young(), curr->is_survivor());
       ret = false;
     }
@@ -361,8 +357,8 @@
     while (curr != NULL) {
       gclog_or_tty->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d",
                              HR_FORMAT_PARAMS(curr),
-                             curr->prev_top_at_mark_start(),
-                             curr->next_top_at_mark_start(),
+                             p2i(curr->prev_top_at_mark_start()),
+                             p2i(curr->next_top_at_mark_start()),
                              curr->age_in_surv_rate_group_cond());
       curr = curr->get_next_young_region();
     }
@@ -487,7 +483,7 @@
   RedirtyLoggedCardTableEntryClosure redirty;
   dcqs.apply_closure_to_all_completed_buffers(&redirty);
   dcqs.iterate_closure_all_threads(&redirty, false);
-  gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
+  gclog_or_tty->print_cr("Log entries = " SIZE_FORMAT ", dirty cards = %d.",
                          clear.num_processed(), orig_count);
   guarantee(redirty.num_processed() == clear.num_processed(),
             err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
@@ -2690,8 +2686,8 @@
         gclog_or_tty->print_cr("Region " HR_FORMAT ", "
                                "HS = " PTR_FORMAT ", should be " PTR_FORMAT,
                                HR_FORMAT_PARAMS(r),
-                               r->humongous_start_region(),
-                               _sh_region);
+                               p2i(r->humongous_start_region()),
+                               p2i(_sh_region));
         ++_failures;
       }
     }
@@ -3002,9 +2998,9 @@
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       if (_g1h->is_obj_dead_cond(obj, _vo)) {
         gclog_or_tty->print_cr("Root location " PTR_FORMAT " "
-                              "points to dead obj " PTR_FORMAT, p, (void*) obj);
+                               "points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
         if (_vo == VerifyOption_G1UseMarkWord) {
-          gclog_or_tty->print_cr("  Mark word: " PTR_FORMAT, (void*)(obj->mark()));
+          gclog_or_tty->print_cr("  Mark word: " INTPTR_FORMAT, (intptr_t)obj->mark());
         }
         obj->print_on(gclog_or_tty);
         _failures = true;
@@ -3052,9 +3048,9 @@
       // contains the nmethod
       if (!hrrs->strong_code_roots_list_contains(_nm)) {
         gclog_or_tty->print_cr("Code root location " PTR_FORMAT " "
-                              "from nmethod " PTR_FORMAT " not in strong "
-                              "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
-                              p, _nm, hr->bottom(), hr->end());
+                               "from nmethod " PTR_FORMAT " not in strong "
+                               "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
+                               p2i(p), p2i(_nm), p2i(hr->bottom()), p2i(hr->end()));
         _failures = true;
       }
     }
@@ -3110,7 +3106,7 @@
     _young_ref_counter_closure.reset_count();
     k->oops_do(&_young_ref_counter_closure);
     if (_young_ref_counter_closure.count() > 0) {
-      guarantee(k->has_modified_oops(), err_msg("Klass %p, has young refs but is not dirty.", k));
+      guarantee(k->has_modified_oops(), err_msg("Klass " PTR_FORMAT ", has young refs but is not dirty.", p2i(k)));
     }
   }
 };
@@ -3185,7 +3181,7 @@
       size_t word_sz = o->size();
       gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT
                           " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
-                          (void*) o, word_sz,
+                          p2i(o), word_sz,
                           _g1->isMarkedPrev(o),
                           _g1->isMarkedNext(o),
                           _hr->obj_allocated_since_prev_marking(o));
@@ -3194,7 +3190,7 @@
       int *val;
       for (cur = start; cur < end; cur++) {
         val = (int *) cur;
-        gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val);
+        gclog_or_tty->print("\t " PTR_FORMAT ": %d\n", p2i(val), *val);
       }
     }
   }
@@ -3232,7 +3228,7 @@
             gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] "
                                    "max_live_bytes " SIZE_FORMAT " "
                                    "< calculated " SIZE_FORMAT,
-                                   r->bottom(), r->end(),
+                                   p2i(r->bottom()), p2i(r->end()),
                                    r->max_live_bytes(),
                                  not_dead_yet_cl.live_bytes());
             _failures = true;
@@ -3449,10 +3445,10 @@
   st->print(" %-20s", "garbage-first heap");
   st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
             capacity()/K, used_unlocked()/K);
-  st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-            _hrm.reserved().start(),
-            _hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords,
-            _hrm.reserved().end());
+  st->print(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+            p2i(_hrm.reserved().start()),
+            p2i(_hrm.reserved().start() + _hrm.length() + HeapRegion::GrainWords),
+            p2i(_hrm.reserved().end()));
   st->cr();
   st->print("  region size " SIZE_FORMAT "K, ", HeapRegion::GrainBytes / K);
   uint young_regions = _young_list->length();
@@ -3470,7 +3466,7 @@
 
   // Print the per-region information.
   st->cr();
-  st->print_cr("Heap Regions: (Y=young(eden), SU=young(survivor), "
+  st->print_cr("Heap Regions: (E=young(eden), S=young(survivor), O=old, "
                "HS=humongous(starts), HC=humongous(continues), "
                "CS=collection set, F=free, TS=gc time stamp, "
                "PTAMS=previous top-at-mark-start, "
@@ -4450,7 +4446,7 @@
                                                oop old) {
   assert(obj_in_cs(old),
          err_msg("obj: " PTR_FORMAT " should still be in the CSet",
-                 (HeapWord*) old));
+                 p2i(old)));
   markOop m = old->mark();
   oop forward_ptr = old->forward_to_atomic(old);
   if (forward_ptr == NULL) {
@@ -4485,7 +4481,7 @@
     assert(old == forward_ptr || !obj_in_cs(forward_ptr),
            err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
                    "should not be in the CSet",
-                   (HeapWord*) old, (HeapWord*) forward_ptr));
+                   p2i(old), p2i(forward_ptr)));
     return forward_ptr;
   }
 }
@@ -5379,8 +5375,7 @@
         _par_scan_state->push_on_queue(p);
       } else {
         assert(!Metaspace::contains((const void*)p),
-               err_msg("Unexpectedly found a pointer from metadata: "
-                              PTR_FORMAT, p));
+               err_msg("Unexpectedly found a pointer from metadata: " PTR_FORMAT, p2i(p)));
         _copy_non_heap_obj_cl->do_oop(p);
       }
     }
@@ -6062,14 +6057,14 @@
 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
                                                HeapWord* tams, HeapWord* end) {
   guarantee(tams <= end,
-            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end));
+            err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, p2i(tams), p2i(end)));
   HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
   if (result < end) {
     gclog_or_tty->cr();
     gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT,
-                           bitmap_name, result);
+                           bitmap_name, p2i(result));
     gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT,
-                           bitmap_name, tams, end);
+                           bitmap_name, p2i(tams), p2i(end));
     return false;
   }
   return true;
@@ -6406,10 +6401,10 @@
         !r->rem_set()->is_empty()) {
 
       if (G1TraceEagerReclaimHumongousObjects) {
-        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+        gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                                region_idx,
-                               obj->size()*HeapWordSize,
-                               r->bottom(),
+                               (size_t)obj->size()*HeapWordSize,
+                               p2i(r->bottom()),
                                r->region_num(),
                                r->rem_set()->occupied(),
                                r->rem_set()->strong_code_roots_list_length(),
@@ -6425,13 +6420,13 @@
     guarantee(obj->is_typeArray(),
               err_msg("Only eagerly reclaiming type arrays is supported, but the object "
                       PTR_FORMAT " is not.",
-                      r->bottom()));
+                      p2i(r->bottom())));
 
     if (G1TraceEagerReclaimHumongousObjects) {
-      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+      gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length %u with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
                              region_idx,
-                             obj->size()*HeapWordSize,
-                             r->bottom(),
+                             (size_t)obj->size()*HeapWordSize,
+                             p2i(r->bottom()),
                              r->region_num(),
                              r->rem_set()->occupied(),
                              r->rem_set()->strong_code_roots_list_length(),
@@ -6585,7 +6580,7 @@
   bool doHeapRegion(HeapRegion* r) {
     if (r->is_young()) {
       gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
-                             r->bottom(), r->end());
+                             p2i(r->bottom()), p2i(r->end()));
       _success = false;
     }
     return false;
@@ -6936,7 +6931,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
       hr->add_strong_code_root_locked(_nm);
@@ -6963,7 +6958,7 @@
       assert(!hr->continuesHumongous(),
              err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
                      " starting at " HR_FORMAT,
-                     _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+                     p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
 
       hr->remove_strong_code_root(_nm);
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -44,6 +44,7 @@
 #include "memory/barrierSet.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/sharedHeap.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/stack.hpp"
 
 // A "G1CollectedHeap" is an implementation of a java heap for HotSpot.
@@ -1150,21 +1151,11 @@
   // Do sanity check on the contents of the in-cset fast test table.
   bool check_cset_fast_test() PRODUCT_RETURN_( return true; );
 
-  // verify_region_sets() performs verification over the region
-  // lists. It will be compiled in the product code to be used when
-  // necessary (i.e., during heap verification).
   void verify_region_sets();
 
   // verify_region_sets_optional() is planted in the code for
-  // list verification in non-product builds (and it can be enabled in
-  // product builds by defining HEAP_REGION_SET_FORCE_VERIFY to be 1).
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() {
-    verify_region_sets();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_region_sets_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  // list verification in debug builds.
+  void verify_region_sets_optional() { DEBUG_ONLY(verify_region_sets();) }
 
 #ifdef ASSERT
   bool is_on_master_free_list(HeapRegion* hr) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -22,10 +22,6 @@
  *
  */
 
-#ifndef __clang_major__
-#define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess.
-#endif
-
 #include "precompiled.hpp"
 #include "gc_implementation/g1/concurrentG1Refine.hpp"
 #include "gc_implementation/g1/concurrentMark.hpp"
@@ -288,7 +284,7 @@
   if (confidence_perc > 100) {
     confidence_perc = 100;
     warning("G1ConfidencePercent is set to a value that is too large, "
-            "it's been updated to %u", confidence_perc);
+            "it's been updated to " UINTX_FORMAT, confidence_perc);
   }
   _sigma = (double) confidence_perc / 100.0;
 
@@ -310,7 +306,7 @@
   if (reserve_perc > 50) {
     reserve_perc = 50;
     warning("G1ReservePercent is set to a value that is too large, "
-            "it's been updated to %u", reserve_perc);
+            "it's been updated to " UINTX_FORMAT, reserve_perc);
   }
   _reserve_factor = (double) reserve_perc / 100.0;
   // This will be set when the heap is expanded
@@ -1853,7 +1849,7 @@
     assert(csr->in_collection_set(), "bad CS");
     st->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
                  HR_FORMAT_PARAMS(csr),
-                 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
+                 p2i(csr->prev_top_at_mark_start()), p2i(csr->next_top_at_mark_start()),
                  csr->age_in_surv_rate_group_cond());
     csr = next;
   }
@@ -2219,7 +2215,7 @@
 void TraceGen0TimeData::print_summary_sd(const char* str,
                                          const NumberSeq* seq) const {
   print_summary(str, seq);
-  gclog_or_tty->print_cr("%+45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
+  gclog_or_tty->print_cr("%45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
                 "(num", seq->num(), seq->sd(), seq->maximum());
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -160,40 +160,43 @@
   } while (0)
 
 
-#define ergo_verbose(_tag_, _action_)                                   \
-  ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
+#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
+  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
-#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
-  ergo_verbose_common(_tag_, _action_, _extra_format_, 0, 0, 0, 0, 0, 0)
+#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
+  ergo_verbose6(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, "")
 
-#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
-                      _arg0_)                                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, 0, 0, 0, 0, 0)
+#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
+  ergo_verbose5(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, _arg3_, "")
+
+#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
+                      _arg0_, _arg1_, _arg2_)                           \
+  ergo_verbose4(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, _arg2_, "")
 
 #define ergo_verbose2(_tag_, _action_, _extra_format_,                  \
                       _arg0_, _arg1_)                                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, 0, 0, 0, 0)
+  ergo_verbose3(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, _arg1_, "")
 
-#define ergo_verbose3(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_)                           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, 0, 0, 0)
+#define ergo_verbose1(_tag_, _action_, _extra_format_,                  \
+                      _arg0_)                                           \
+  ergo_verbose2(_tag_, _action_, _extra_format_ "%s",                   \
+                _arg0_, "")
 
-#define ergo_verbose4(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_)                   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, 0, 0)
 
-#define ergo_verbose5(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_)           \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, 0)
+#define ergo_verbose0(_tag_, _action_, _extra_format_)                  \
+  ergo_verbose1(_tag_, _action_, _extra_format_ "%s",                   \
+                "")
+
+#define ergo_verbose(_tag_, _action_)                                   \
+  ergo_verbose0(_tag_, _action_, "")
 
-#define ergo_verbose6(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)   \
-  ergo_verbose_common(_tag_, _action_, _extra_format_,                  \
-                      _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
 
 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/g1HeapRegionEventSender.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -33,7 +33,7 @@
   bool doHeapRegion(HeapRegion* r) {
     EventG1HeapRegionInformation evt;
     evt.set_index(r->hrm_index());
-    // XXX TODO evt.set_type(r->get_trace_type());
+    evt.set_type(r->get_trace_type());
     evt.set_start((uintptr_t)r->bottom());
     evt.set_used(r->used());
     evt.commit();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -26,18 +26,12 @@
 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
 
 #include "gc_implementation/g1/heapRegion.hpp"
+#include "utilities/macros.hpp"
 
 // Large buffer for some cases where the output might be larger than normal.
 #define HRS_ERR_MSG_BUFSZ 512
 typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
 
-// Set verification will be forced either if someone defines
-// HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
-// asserts are compiled in.
-#ifndef HEAP_REGION_SET_FORCE_VERIFY
-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
-#endif // HEAP_REGION_SET_FORCE_VERIFY
-
 class hrs_ext_msg;
 
 class HRSMtSafeChecker : public CHeapObj<mtGC> {
@@ -145,13 +139,7 @@
   void verify_next_region(HeapRegion* hr);
   void verify_end();
 
-#if HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() {
-    verify();
-  }
-#else // HEAP_REGION_SET_FORCE_VERIFY
-  void verify_optional() { }
-#endif // HEAP_REGION_SET_FORCE_VERIFY
+  void verify_optional() { DEBUG_ONLY(verify();) }
 
   virtual void print_on(outputStream* out, bool print_contents = false);
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -401,7 +401,9 @@
   start_array()->set_covered_region(new_memregion);
   Universe::heap()->barrier_set()->resize_covered_region(new_memregion);
 
-  // ALWAYS do this last!!
+  // The update of the space's end is done by this call.  As that
+  // makes the new space available for concurrent allocation, this
+  // must be the last step when expanding.
   object_space()->initialize(new_memregion,
                              SpaceDecorator::DontClear,
                              SpaceDecorator::DontMangle);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -38,6 +38,7 @@
     // we need to ensure that it is copied (see comment in
     // ParScanClosure::do_oop_work).
     Klass* objK = obj->klass();
+    OrderAccess::loadload();
     markOop m = obj->mark();
     oop new_obj;
     if (m->is_marked()) { // Contains forwarding pointer.
@@ -101,6 +102,7 @@
       // overwritten with an overflow next pointer after the object is
       // forwarded.
       Klass* objK = obj->klass();
+      OrderAccess::loadload();
       markOop m = obj->mark();
       oop new_obj;
       if (m->is_marked()) { // Contains forwarding pointer.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shared/mutableSpace.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shared/mutableSpace.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, 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
@@ -28,6 +28,7 @@
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "gc_implementation/shared/spaceDecorator.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
 #endif // INCLUDE_ALL_GCS
@@ -124,7 +125,11 @@
   }
 
   set_bottom(mr.start());
-  set_end(mr.end());
+  // When expanding concurrently with callers of cas_allocate, setting end
+  // makes the new space available for allocation by other threads.  So this
+  // assignment must follow all other configuration and initialization that
+  // might be done for expansion.
+  OrderAccess::release_store_ptr(end_addr(), mr.end());
 
   if (clear_space) {
     clear(mangle_space);
@@ -192,7 +197,11 @@
 // This version is lock-free.
 HeapWord* MutableSpace::cas_allocate(size_t size) {
   do {
-    HeapWord* obj = top();
+    // Read top before end, else the range check may pass when it shouldn't.
+    // If end is read first, other threads may advance end and top such that
+    // current top > old end and current top + size > current end.  Then
+    // pointer_delta underflows, allowing installation of top > current end.
+    HeapWord* obj = (HeapWord*)OrderAccess::load_ptr_acquire(top_addr());
     if (pointer_delta(end(), obj) >= size) {
       HeapWord* new_top = obj + size;
       HeapWord* result = (HeapWord*)Atomic::cmpxchg_ptr(new_top, top_addr(), obj);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/mode/shenandoahIUMode.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/mode/shenandoahIUMode.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/mode/shenandoahIUMode.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/mode/shenandoahIUMode.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -31,6 +31,11 @@
 #include "gc_implementation/shenandoah/shenandoahLogging.hpp"
 
 void ShenandoahIUMode::initialize_flags() const {
+  if (FLAG_IS_CMDLINE(ClassUnloadingWithConcurrentMark) && ClassUnloading) {
+    log_warning(gc)("Shenandoah I-U mode sets -XX:-ClassUnloadingWithConcurrentMark; see JDK-8261341 for details");
+  }
+  FLAG_SET_DEFAULT(ClassUnloadingWithConcurrentMark, false);
+
   if (FLAG_IS_DEFAULT(ShenandoahStoreValEnqueueBarrier)) {
     FLAG_SET_DEFAULT(ShenandoahStoreValEnqueueBarrier, true);
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentMark.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentMark.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentMark.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentMark.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2021, Red Hat, Inc. All rights reserved.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
@@ -489,12 +489,13 @@
   // JNIHandle::weak_oops_do() to cleanup JNI and JVMTI weak oops.
   if (_heap->process_references()) {
     weak_refs_work(full_gc);
-  } else {
-    weak_roots_work(full_gc);
   }
 
   // And finally finish class unloading
   if (_heap->unload_classes()) {
+    // We don't mark through weak roots with class unloading cycle,
+    // so process them here.
+    weak_roots_work(full_gc);
     _heap->unload_classes_and_cleanup_tables(full_gc);
   } else if (ShenandoahStringDedup::is_enabled()) {
     ShenandoahStringDedup::parallel_cleanup();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -135,7 +135,9 @@
   Universe::check_alignment(init_byte_size, reg_size_bytes, "Shenandoah heap");
 
   _num_regions = ShenandoahHeapRegion::region_count();
-
+  assert(_num_regions == (max_byte_size / reg_size_bytes),
+         err_msg("Regions should cover entire heap exactly: " SIZE_FORMAT " != " SIZE_FORMAT "/" SIZE_FORMAT,
+                 _num_regions, max_byte_size, reg_size_bytes));
   // Now we know the number of regions, initialize the heuristics.
   initialize_heuristics();
 
@@ -1642,6 +1644,15 @@
       set_process_references(heuristics()->can_process_references());
       set_unload_classes(heuristics()->can_unload_classes());
 
+      if (_heap->process_references()) {
+        ReferenceProcessor* rp = _heap->ref_processor();
+        rp->set_active_mt_degree(_heap->workers()->active_workers());
+
+        // enable ("weak") refs discovery
+        rp->enable_discovery(true /*verify_no_refs*/, true);
+        rp->setup_policy(_heap->collector_policy()->should_clear_all_soft_refs());
+      }
+
       op_reset();
 
       op_init_mark();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -37,6 +37,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
+#include "utilities/align.hpp"
 
 size_t ShenandoahHeapRegion::RegionCount = 0;
 size_t ShenandoahHeapRegion::RegionSizeBytes = 0;
@@ -433,7 +434,7 @@
   }
 }
 
-void ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
+size_t ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
   // Absolute minimums we should not ever break:
   static const size_t MIN_REGION_SIZE = 256*K;
 
@@ -519,14 +520,28 @@
     vm_exit_during_initialization("Invalid -XX:ShenandoahHumongousThreshold option, should be within [1..100]");
   }
 
-  // Make sure region size is at least one large page, if enabled.
-  // Otherwise, uncommitting one region may falsely uncommit the adjacent
-  // regions too.
-  // Also see shenandoahArguments.cpp, where it handles UseLargePages.
-  if (UseLargePages && ShenandoahUncommit) {
-    region_size = MAX2(region_size, os::large_page_size());
+  // Make sure region size and heap size are page aligned.
+  // If large pages are used, we ensure that region size is aligned to large page size if
+  // heap size is large enough to accommodate minimal number of regions. Otherwise, we align
+  // region size to regular page size.
+
+  // Figure out page size to use, and aligns up heap to page size
+  int page_size = os::vm_page_size();
+  if (UseLargePages) {
+    size_t large_page_size = os::large_page_size();
+    max_heap_size = align_up(max_heap_size, large_page_size);
+    if ((max_heap_size / align_up(region_size, large_page_size)) >= MIN_NUM_REGIONS) {
+      page_size = (int)large_page_size;
+    } else {
+      // Should have been checked during argument initialization
+      assert(!ShenandoahUncommit, "Uncommit requires region size aligns to large page size");
+    }
+  } else {
+    max_heap_size = align_up(max_heap_size, page_size);
   }
 
+  // Align region size to page size
+  region_size = align_up(region_size, page_size);
   int region_size_log = log2_long((jlong) region_size);
   // Recalculate the region size to make sure it's a power of
   // 2. This means that region_size is the largest power of 2 that's
@@ -552,7 +567,7 @@
   RegionSizeBytesMask = RegionSizeBytes - 1;
 
   guarantee(RegionCount == 0, "we should only set it once");
-  RegionCount = max_heap_size / RegionSizeBytes;
+  RegionCount = align_up(max_heap_size, RegionSizeBytes) / RegionSizeBytes;
 
   guarantee(HumongousThresholdWords == 0, "we should only set it once");
   HumongousThresholdWords = RegionSizeWords * ShenandoahHumongousThreshold / 100;
@@ -596,6 +611,8 @@
                      byte_size_in_proper_unit(HumongousThresholdBytes), proper_unit_for_byte_size(HumongousThresholdBytes));
   log_info(gc, init)("Max TLAB size: " SIZE_FORMAT "%s",
                      byte_size_in_proper_unit(MaxTLABSizeBytes), proper_unit_for_byte_size(MaxTLABSizeBytes));
+
+  return max_heap_size;
 }
 
 void ShenandoahHeapRegion::do_commit() {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -247,7 +247,8 @@
 
   static const size_t MIN_NUM_REGIONS = 10;
 
-  static void setup_sizes(size_t max_heap_size);
+  // Return adjusted max heap size
+  static size_t setup_sizes(size_t max_heap_size);
 
   double empty_time() {
     return _empty_time;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahMarkCompact.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahMarkCompact.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahMarkCompact.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahMarkCompact.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -908,7 +908,7 @@
 
       Copy::aligned_conjoint_words(heap->get_region(old_start)->bottom(),
                                    heap->get_region(new_start)->bottom(),
-                                   ShenandoahHeapRegion::region_size_words()*num_regions);
+                                   words_size);
 
       oop new_obj = oop(heap->get_region(new_start)->bottom());
       new_obj->init_mark();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -368,6 +368,8 @@
 
   // The parallel work done by all worker threads.
   void work(uint worker_id) {
+    pre_work_verification();
+
     // Do first pass of code cache cleaning.
     _code_cache_task.work_first_pass(worker_id);
 
@@ -386,6 +388,8 @@
 
     // Clean all klasses that were not unloaded.
     _klass_cleaning_task.work();
+
+    post_work_verification();
   }
 
 };
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahVerifier.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahVerifier.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahVerifier.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/gc_implementation/shenandoah/shenandoahVerifier.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -570,11 +570,11 @@
 
 class VerifyThreadGCState : public ThreadClosure {
 private:
-  const char* _label;
-  char _expected;
+  const char* const _label;
+         char const _expected;
 
 public:
-  VerifyThreadGCState(const char* label, char expected) : _expected(expected) {}
+  VerifyThreadGCState(const char* label, char expected) : _label(label), _expected(expected) {}
   void do_thread(Thread* t) {
     assert(t->is_Java_thread(), "sanity");
     char actual = ((JavaThread*)t)->gc_state();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/interpreter/interpreterRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/interpreter/interpreterRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/interpreter/interpreterRuntime.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1206,6 +1206,7 @@
         } else {
           // debugging suppport
           if (PrintSignatureHandlers) {
+            ttyLocker ttyl;
             tty->cr();
             tty->print_cr("argument handler #%d for: %s %s (fingerprint = " UINT64_FORMAT ", %d bytes generated)",
                           _handlers->length(),
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -238,6 +238,10 @@
  JfrJavaLog::log(tag_set, level, message, thread);
 JVM_END
 
+JVM_ENTRY_NO_ENV(jboolean, jfr_should_log(JNIEnv* env, jobject jvm, jint level))
+ return JfrJavaLog::should_log(level, thread) ? JNI_TRUE : JNI_FALSE;
+JVM_END
+
 JVM_ENTRY_NO_ENV(void, jfr_subscribe_log_level(JNIEnv* env, jobject jvm, jobject log_tag, jint id))
  JfrJavaLog::subscribe_log_level(log_tag, id, thread);
 JVM_END
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethod.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -67,6 +67,8 @@
 
 void JNICALL jfr_log(JNIEnv* env, jobject jvm, jint tag_set, jint level, jstring message);
 
+jboolean JNICALL jfr_should_log(JNIEnv* env, jobject jvm, jint level);
+
 void JNICALL jfr_retransform_classes(JNIEnv* env, jobject jvm, jobjectArray classes);
 
 void JNICALL jfr_set_enabled(JNIEnv* env, jobject jvm, jlong event_type_id, jboolean enabled);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/jni/jfrJniMethodRegistration.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -49,6 +49,7 @@
       (char*)"getTicksFrequency", (char*)"()J", (void*)jfr_elapsed_frequency,
       (char*)"subscribeLogLevel", (char*)"(Ljdk/jfr/internal/LogTag;I)V", (void*)jfr_subscribe_log_level,
       (char*)"log", (char*)"(IILjava/lang/String;)V", (void*)jfr_log,
+      (char*)"shouldLog", (char*)"(I)Z", (void*)jfr_should_log,
       (char*)"retransformClasses", (char*)"([Ljava/lang/Class;)V", (void*)jfr_retransform_classes,
       (char*)"setEnabled", (char*)"(JZ)V", (void*)jfr_set_enabled,
       (char*)"setFileNotification", (char*)"(J)V", (void*)jfr_set_file_notification,
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -151,13 +151,12 @@
 }
 
 void MonitorInflateCauseConstant::serialize(JfrCheckpointWriter& writer) {
-  // XXX no such counters. implement?
-//  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
-//  writer.write_count(nof_entries);
-//  for (u4 i = 0; i < nof_entries; ++i) {
-//    writer.write_key(i);
-//    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
-//  }
+  static const u4 nof_entries = ObjectSynchronizer::inflate_cause_nof;
+  writer.write_count(nof_entries);
+  for (u4 i = 0; i < nof_entries; ++i) {
+    writer.write_key(i);
+    writer.write(ObjectSynchronizer::inflate_cause_name((ObjectSynchronizer::InflateCause)i));
+  }
 }
 
 void GCCauseConstant::serialize(JfrCheckpointWriter& writer) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -29,6 +29,7 @@
 const julong MAX_ADJUSTED_GLOBAL_BUFFER_SIZE = 1 * M;
 const julong MIN_ADJUSTED_GLOBAL_BUFFER_SIZE_CUTOFF = 512 * K;
 const julong MIN_GLOBAL_BUFFER_SIZE = 64 * K;
+const julong MAX_GLOBAL_BUFFER_SIZE = 2 * G;
 // implies at least 2 * MIN_GLOBAL_BUFFER SIZE
 const julong MIN_BUFFER_COUNT = 2;
 // MAX global buffer count open ended
@@ -36,6 +37,7 @@
 // MAX thread local buffer size == size of a single global buffer (runtime determined)
 // DEFAULT thread local buffer size = 2 * os page size (runtime determined)
 const julong MIN_THREAD_BUFFER_SIZE = 4 * K;
+const julong MAX_THREAD_BUFFER_SIZE = 2 * G;
 const julong MIN_MEMORY_SIZE = 1 * M;
 const julong DEFAULT_MEMORY_SIZE = 10 * M;
 
@@ -304,6 +306,11 @@
   options->global_buffer_size = div_total_by_units(options->memory_size, options->buffer_count);
   if (options->thread_buffer_size > options->global_buffer_size) {
     options->global_buffer_size = options->thread_buffer_size;
+    if (options->memory_size_configured) {
+      options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
+    } else {
+      options->memory_size = multiply(options->global_buffer_size, options->buffer_count);
+    }
     options->buffer_count = div_total_by_per_unit(options->memory_size, options->global_buffer_size);
   }
   assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
@@ -323,7 +330,8 @@
   assert(options->memory_size % os::vm_page_size() == 0, "invariant");
   assert(options->global_buffer_size % os::vm_page_size() == 0, "invariant");
   assert(options->thread_buffer_size % os::vm_page_size() == 0, "invariant");
-  assert(options->buffer_count > 0, "invariant");
+  assert(options->buffer_count >= MIN_BUFFER_COUNT, "invariant");
+  assert(options->global_buffer_size >= options->thread_buffer_size, "invariant");
 }
 #endif
 
@@ -428,6 +436,10 @@
     default:
       default_size(options);
   }
+  if (options->buffer_count < MIN_BUFFER_COUNT ||
+      options->global_buffer_size < options->thread_buffer_size) {
+    return false;
+  }
   DEBUG_ONLY(assert_post_condition(options);)
   return true;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrMemorySizer.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -32,6 +32,8 @@
 extern const julong MIN_GLOBAL_BUFFER_SIZE;
 extern const julong MIN_MEMORY_SIZE;
 extern const julong MIN_THREAD_BUFFER_SIZE;
+extern const julong MAX_GLOBAL_BUFFER_SIZE;
+extern const julong MAX_THREAD_BUFFER_SIZE;
 
 struct JfrMemoryOptions {
   julong memory_size;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, 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
@@ -390,34 +390,41 @@
   return value;
 }
 
-template <typename Argument>
-static void log_lower_than_min_value(Argument& memory_argument, julong min_value) {
+static const char higher_than_msg[] = "This value is higher than the maximum size limited ";
+static const char lower_than_msg[] = "This value is lower than the minimum size required ";
+template <typename Argument, bool lower>
+static void log_out_of_range_value(Argument& memory_argument, julong min_value) {
+  const char* msg = lower ? lower_than_msg : higher_than_msg;
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "This value is lower than the minimum size required " JULONG_FORMAT "%c",
+      "%s" JULONG_FORMAT "%c", msg,
       divide_with_user_unit(memory_argument, min_value),
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "This value is lower than the minimum size required " JULONG_FORMAT,
+    "%s" JULONG_FORMAT, msg,
     divide_with_user_unit(memory_argument, min_value));
 }
 
+static const char default_val_msg[] = "Value default for option ";
+static const char specified_val_msg[] = "Value specified for option ";
 template <typename Argument>
 static void log_set_value(Argument& memory_argument) {
   if (memory_argument.value()._size != memory_argument.value()._val) {
     // has multiplier
     tty->print_cr(
-      "Value specified for option \"%s\" is " JULONG_FORMAT "%c",
+      "%s\"%s\" is " JULONG_FORMAT "%c",
+      memory_argument.is_set() ? specified_val_msg: default_val_msg,
       memory_argument.name(),
       memory_argument.value()._val,
       memory_argument.value()._multiplier);
     return;
   }
   tty->print_cr(
-    "Value specified for option \"%s\" is " JULONG_FORMAT,
+    "%s\"%s\" is " JULONG_FORMAT,
+    memory_argument.is_set() ? specified_val_msg: default_val_msg,
     memory_argument.name(), memory_argument.value()._val);
 }
 
@@ -538,6 +545,10 @@
         return false;
       }
     }
+  } else if (options.thread_buffer_size_configured && options.memory_size_configured) {
+    if (!ensure_first_gteq_second(_dcmd_memorysize, _dcmd_threadbuffersize)) {
+      return false;
+    }
   }
   return true;
 }
@@ -606,7 +617,7 @@
 static bool ensure_gteq(Argument& memory_argument, const jlong value) {
   if ((jlong)memory_argument.value()._size < value) {
     log_set_value(memory_argument);
-    log_lower_than_min_value(memory_argument, value);
+    log_out_of_range_value<Argument, true>(memory_argument, value);
     return false;
   }
   return true;
@@ -637,6 +648,30 @@
   return true;
 }
 
+template <typename Argument>
+static bool ensure_lteq(Argument& memory_argument, const jlong value) {
+  if ((jlong)memory_argument.value()._size > value) {
+    log_set_value(memory_argument);
+    log_out_of_range_value<Argument, false>(memory_argument, value);
+    return false;
+  }
+  return true;
+}
+
+static bool ensure_valid_maximum_sizes() {
+  if (_dcmd_globalbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_globalbuffersize, MAX_GLOBAL_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  if (_dcmd_threadbuffersize.is_set()) {
+    if (!ensure_lteq(_dcmd_threadbuffersize, MAX_THREAD_BUFFER_SIZE)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Starting with the initial set of memory values from the user,
  * sanitize, enforce min/max rules and adjust to a set of consistent options.
@@ -644,7 +679,7 @@
  * Adjusted memory sizes will be page aligned.
  */
 bool JfrOptionSet::adjust_memory_options() {
-  if (!ensure_valid_minimum_sizes()) {
+  if (!ensure_valid_minimum_sizes() || !ensure_valid_maximum_sizes()) {
     return false;
   }
   JfrMemoryOptions options;
@@ -653,6 +688,24 @@
     return false;
   }
   if (!JfrMemorySizer::adjust_options(&options)) {
+    if (options.buffer_count < MIN_BUFFER_COUNT || options.global_buffer_size < options.thread_buffer_size) {
+      log_set_value(_dcmd_memorysize);
+      log_set_value(_dcmd_globalbuffersize);
+      tty->print_cr("%s \"%s\" is " JLONG_FORMAT,
+        _dcmd_numglobalbuffers.is_set() ? specified_val_msg: default_val_msg,
+        _dcmd_numglobalbuffers.name(), _dcmd_numglobalbuffers.value());
+       log_set_value(_dcmd_threadbuffersize);
+      if (options.buffer_count < MIN_BUFFER_COUNT) {
+        tty->print_cr("numglobalbuffers " JULONG_FORMAT " is less than minimal value " JULONG_FORMAT,
+          options.buffer_count, MIN_BUFFER_COUNT);
+        tty->print_cr("Decrease globalbuffersize/threadbuffersize or increase memorysize");
+      } else {
+        tty->print_cr("globalbuffersize " JULONG_FORMAT " is less than threadbuffersize" JULONG_FORMAT,
+          options.global_buffer_size, options.thread_buffer_size);
+        tty->print_cr("Decrease globalbuffersize or increase memorysize or adjust global/threadbuffersize");
+      }
+      return false;
+    }
     if (!check_for_ambiguity(_dcmd_memorysize, _dcmd_globalbuffersize, _dcmd_numglobalbuffers)) {
       return false;
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -139,3 +139,7 @@
   // log_tag_sets[tag_set].log_tag_set->log((LogLevelType)level, s);
   tty->print_cr("JFR: %s", s);
 }
+
+bool JfrJavaLog::should_log(jint level, TRAPS) {
+  return LogJFR;
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/jfr/utilities/jfrJavaLog.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -43,6 +43,7 @@
  public:
   static void subscribe_log_level(jobject log_tag, jint id, TRAPS);
   static void log(jint tag_set, jint level, jstring message, TRAPS);
+  static bool should_log(jint level, TRAPS);
 };
 
 #endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/libadt/set.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/libadt/set.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/libadt/set.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/libadt/set.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -66,7 +66,7 @@
 // The caller must deallocate the string.
 char *Set::setstr() const
 {
-  if( !this ) return os::strdup("{no set}");
+  if( this == NULL ) return os::strdup("{no set}");
   Set &set = clone();           // Virtually copy the basic set.
   set.Sort();                   // Sort elements for in-order retrieval
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -45,9 +45,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class Chunk_t, class FreeList_t>
-size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
-
-template <class Chunk_t, class FreeList_t>
 TreeChunk<Chunk_t, FreeList_t>* TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(Chunk_t* fc) {
   // Do some assertion checking here.
   return (TreeChunk<Chunk_t, FreeList_t>*) fc;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/binaryTreeDictionary.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -164,15 +164,17 @@
   Chunk_t* prev() const { return Chunk_t::prev(); }
   size_t size() const volatile { return Chunk_t::size(); }
 
-  static size_t min_size() {
-    return _min_tree_chunk_size;
-  }
+  static size_t min_size();
 
   // debugging
   void verify_tree_chunk_list() const;
   void assert_is_mangled() const;
 };
 
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize;
+template <class Chunk_t, class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::min_size() { return _min_tree_chunk_size; }
 
 template <class Chunk_t, class FreeList_t>
 class BinaryTreeDictionary: public FreeBlockDictionary<Chunk_t> {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/filemap.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/filemap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/filemap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/filemap.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -452,7 +452,7 @@
       // close and remove the file. See bug 6372906.
       close();
       remove(_full_path);
-      fail_stop("Unable to write to shared archive file.", NULL);
+      fail_stop("Unable to write to shared archive file.");
     }
   }
   _file_offset += nbytes;
@@ -471,7 +471,7 @@
       // that the written file is the correct length.
       _file_offset -= 1;
       if (lseek(_fd, (long)_file_offset, SEEK_SET) < 0) {
-        fail_stop("Unable to seek.", NULL);
+        fail_stop("Unable to seek.");
       }
       char zero = 0;
       write_bytes(&zero, 1);
@@ -542,7 +542,7 @@
   // other reserved memory (like the code cache).
   ReservedSpace rs(size, os::vm_allocation_granularity(), false, requested_addr);
   if (!rs.is_reserved()) {
-    fail_continue(err_msg("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr));
+    fail_continue("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr);
     return rs;
   }
   // the reserved virtual memory is for mapping class data sharing archive
@@ -566,7 +566,7 @@
                               requested_addr, size, si->_read_only,
                               si->_allow_exec);
   if (base == NULL || base != si->_base) {
-    fail_continue(err_msg("Unable to map %s shared space at required address.", shared_region_name[i]));
+    fail_continue("Unable to map %s shared space at required address.", shared_region_name[i]);
     return NULL;
   }
 #ifdef _WINDOWS
@@ -605,7 +605,7 @@
 
 void FileMapInfo::assert_mark(bool check) {
   if (!check) {
-    fail_stop("Mark mismatch while restoring from shared file.", NULL);
+    fail_stop("Mark mismatch while restoring from shared file.");
   }
 }
 
@@ -748,7 +748,7 @@
 void FileMapInfo::stop_sharing_and_unmap(const char* msg) {
   FileMapInfo *map_info = FileMapInfo::current_info();
   if (map_info) {
-    map_info->fail_continue(msg);
+    map_info->fail_continue("%s", msg);
     for (int i = 0; i < MetaspaceShared::n_regions; i++) {
       if (map_info->_header->_space[i]._base != NULL) {
         map_info->unmap_region(i);
@@ -756,6 +756,6 @@
       }
     }
   } else if (DumpSharedSpaces) {
-    fail_stop(msg, NULL);
+    fail_stop("%s", msg);
   }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/filemap.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/filemap.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/memory/filemap.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/memory/filemap.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -196,8 +196,8 @@
   bool  remap_shared_readonly_as_readwrite();
 
   // Errors.
-  static void fail_stop(const char *msg, ...);
-  static void fail_continue(const char *msg, ...);
+  static void fail_stop(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
+  static void fail_continue(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
 
   // Return true if given address is in the mapped shared space.
   bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/chaitin.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/chaitin.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/chaitin.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/chaitin.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2084,7 +2084,7 @@
 // Dump a register name into a buffer.  Be intelligent if we get called
 // before allocation is complete.
 char *PhaseChaitin::dump_register( const Node *n, char *buf  ) const {
-  if( !this ) {                 // Not got anything?
+  if( this == NULL ) {          // Not got anything?
     sprintf(buf,"N%d",n->_idx); // Then use Node index
   } else if( _node_regs ) {
     // Post allocation, use direct mappings, no LRG info available
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/compile.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/compile.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/compile.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/compile.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2101,13 +2101,16 @@
 // They were inserted during parsing (see add_safepoint()) to make
 // infinite loops without calls or exceptions visible to root, i.e.,
 // useful.
-void Compile::remove_root_to_sfpts_edges() {
+void Compile::remove_root_to_sfpts_edges(PhaseIterGVN& igvn) {
   Node *r = root();
   if (r != NULL) {
     for (uint i = r->req(); i < r->len(); ++i) {
       Node *n = r->in(i);
       if (n != NULL && n->is_SafePoint()) {
         r->rm_prec(i);
+        if (n->outcnt() == 0) {
+          igvn.remove_dead_node(n);
+        }
         --i;
       }
     }
@@ -2171,7 +2174,7 @@
 
   // Now that all inlining is over, cut edge from root to loop
   // safepoints
-  remove_root_to_sfpts_edges();
+  remove_root_to_sfpts_edges(igvn);
 
   // Remove the speculative part of types and clean up the graph from
   // the extra CastPP nodes whose only purpose is to carry them. Do
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/compile.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/compile.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/compile.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/compile.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -975,7 +975,7 @@
   void inline_incrementally(PhaseIterGVN& igvn);
   void inline_string_calls(bool parse_time);
   void inline_boxing_calls(PhaseIterGVN& igvn);
-  void remove_root_to_sfpts_edges();
+  void remove_root_to_sfpts_edges(PhaseIterGVN& igvn);
 
   // Matching, CFG layout, allocation, code generation
   PhaseCFG*         cfg()                       { return _cfg; }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/output.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/output.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/opto/output.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/opto/output.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -28,6 +28,7 @@
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compileBroker.hpp"
+#include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "memory/allocation.inline.hpp"
 #include "opto/callnode.hpp"
@@ -1510,8 +1511,17 @@
       }
 
 #ifdef ASSERT
-      if (n->size(_regalloc) < (current_offset-instr_offset)) {
+      uint n_size = n->size(_regalloc);
+      if (n_size < (current_offset-instr_offset)) {
+        MachNode* mach = n->as_Mach();
         n->dump();
+        mach->dump_format(_regalloc, tty);
+        tty->print_cr(" n_size (%d), current_offset (%d), instr_offset (%d)", n_size, current_offset, instr_offset);
+        Disassembler::decode(cb->insts_begin() + instr_offset, cb->insts_begin() + current_offset + 1, tty);
+        tty->print_cr(" ------------------- ");
+        BufferBlob* blob = this->scratch_buffer_blob();
+        address blob_begin = blob->content_begin();
+        Disassembler::decode(blob_begin, blob_begin + n_size + 1, tty);
         assert(false, "wrong size of mach node");
       }
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jni.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jni.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jni.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jni.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -38,6 +38,7 @@
 #include "utilities/ostream.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc_implementation/shenandoah/shenandoahStringDedup.hpp"
 #endif // INCLUDE_ALL_GCS
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
@@ -1454,7 +1455,7 @@
                                env, clazz, (uintptr_t) methodID);
 #endif /* USDT2 */
   jobject obj = NULL;
-  DT_RETURN_MARK(NewObjectA, jobject, (const jobject)obj);
+  DT_RETURN_MARK(NewObjectA, jobject, (const jobject&)obj);
 
   instanceOop i = alloc_object(clazz, CHECK_NULL);
   obj = JNIHandles::make_local(env, i);
@@ -4327,19 +4328,48 @@
   HOTSPOT_JNI_GETSTRINGCRITICAL_ENTRY(
                                       env, string, (uintptr_t *) isCopy);
 #endif /* USDT2 */
-  if (isCopy != NULL) {
-    *isCopy = JNI_FALSE;
+  jchar* ret;
+  if (!UseShenandoahGC) {
+    GC_locker::lock_critical(thread);
+    if (isCopy != NULL) {
+      *isCopy = JNI_FALSE;
+    }
+    oop s = JNIHandles::resolve_non_null(string);
+    int s_len = java_lang_String::length(s);
+    typeArrayOop s_value = java_lang_String::value(s);
+    int s_offset = java_lang_String::offset(s);
+    if (s_len > 0) {
+      ret = s_value->char_at_addr(s_offset);
+    } else {
+      ret = (jchar*) s_value->base(T_CHAR);
+    }
   }
-  oop s = lock_gc_or_pin_object(thread, string);
-  int s_len = java_lang_String::length(s);
-  typeArrayOop s_value = java_lang_String::value(s);
-  int s_offset = java_lang_String::offset(s);
-  const jchar* ret;
-  if (s_len > 0) {
-    ret = s_value->char_at_addr(s_offset);
-  } else {
-    ret = (jchar*) s_value->base(T_CHAR);
+#if INCLUDE_ALL_GCS
+  else {
+    assert(UseShenandoahGC, "This path should only be taken with Shenandoah");
+    oop s = JNIHandles::resolve_non_null(string);
+    if (ShenandoahStringDedup::is_enabled()) {
+      typeArrayOop s_value = java_lang_String::value(s);
+      int s_len = java_lang_String::length(s);
+      ret = NEW_C_HEAP_ARRAY_RETURN_NULL(jchar, s_len + 1, mtInternal);  // add one for zero termination
+      /* JNI Specification states return NULL on OOM */
+      if (ret != NULL) {
+        memcpy(ret, s_value->char_at_addr(0), s_len * sizeof(jchar));
+        ret[s_len] = 0;
+      }
+      if (isCopy != NULL) *isCopy = JNI_TRUE;
+    } else {
+      typeArrayOop s_value = java_lang_String::value(s);
+      s_value = (typeArrayOop) Universe::heap()->pin_object(thread, s_value);
+      ret = (jchar *) s_value->base(T_CHAR);
+      if (isCopy != NULL) *isCopy = JNI_FALSE;
+    }
   }
+#else
+  else {
+    ShouldNotReachHere();
+  }
+#endif
 #ifndef USDT2
   DTRACE_PROBE1(hotspot_jni, GetStringCritical__return, ret);
 #else /* USDT2 */
@@ -4358,8 +4388,28 @@
   HOTSPOT_JNI_RELEASESTRINGCRITICAL_ENTRY(
                                           env, str, (uint16_t *) chars);
 #endif /* USDT2 */
-  // The str and chars arguments are ignored
-  unlock_gc_or_unpin_object(thread, str);
+  if (!UseShenandoahGC) {
+    // The str and chars arguments are ignored
+    GC_locker::unlock_critical(thread);
+  }
+#if INCLUDE_ALL_GCS
+  else if (ShenandoahStringDedup::is_enabled()) {
+    assert(UseShenandoahGC, "This path should only be taken with Shenandoah");
+    // For copied string value, free jchar array allocated by earlier call to GetStringCritical.
+    // This assumes that ReleaseStringCritical bookends GetStringCritical.
+    FREE_C_HEAP_ARRAY(jchar, chars, mtInternal);
+  } else {
+    assert(UseShenandoahGC, "This path should only be taken with Shenandoah");
+    oop s = JNIHandles::resolve_non_null(str);
+    // For not copied string value, drop the associated gc-locker/pin.
+    typeArrayOop s_value = java_lang_String::value(s);
+    Universe::heap()->unpin_object(thread, s_value);
+  }
+#else
+  else {
+    ShouldNotReachHere();
+  }
+#endif
 #ifndef USDT2
   DTRACE_PROBE(hotspot_jni, ReleaseStringCritical__return);
 #else /* USDT2 */
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvm.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvm.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvm.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvm.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1779,6 +1779,18 @@
         found = (k() == inner_klass);
         if (found && ooff != 0) {
           ok = i_cp->klass_at(ooff, CHECK_NULL);
+          if (!ok->oop_is_instance()) {
+            // If the outer class is not an instance klass then it cannot have
+            // declared any inner classes.
+            ResourceMark rm(THREAD);
+            Exceptions::fthrow(
+              THREAD_AND_LOCATION,
+              vmSymbols::java_lang_IncompatibleClassChangeError(),
+              "%s and %s disagree on InnerClasses attribute",
+              ok->external_name(),
+              k->external_name());
+            return NULL;
+          }
           outer_klass = instanceKlassHandle(thread, ok);
           *inner_is_member = true;
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiEnvBase.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiEnvBase.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiEnvBase.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1092,7 +1092,7 @@
           // If the monitor has no owner, then a non-suspended contending
           // thread could potentially change the state of the monitor by
           // entering it. The JVM/TI spec doesn't allow this.
-          if (owning_thread == NULL && !at_safepoint &
+          if (owning_thread == NULL && !at_safepoint &&
               !JvmtiEnv::is_thread_fully_suspended(pending_thread, true, &debug_bits)) {
             if (ret.owner != NULL) {
               destroy_jni_reference(calling_thread, ret.owner);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiImpl.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiImpl.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiImpl.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiImpl.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -64,6 +64,7 @@
 
 class GrowableElement : public CHeapObj<mtInternal> {
 public:
+  virtual ~GrowableElement() {}
   virtual address getCacheValue()          =0;
   virtual bool equals(GrowableElement* e)  =0;
   virtual bool lessThan(GrowableElement *e)=0;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiTagMap.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiTagMap.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/jvmtiTagMap.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/jvmtiTagMap.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -2805,6 +2805,7 @@
   return true;
 }
 
+#ifdef ASSERT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2819,6 +2820,7 @@
     return false;
   }
 }
+#endif // #ifdef ASSERT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/methodHandles.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/methodHandles.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/prims/methodHandles.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/prims/methodHandles.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -972,6 +972,13 @@
       return mname;
     }
   }
+
+  if (new_index < len) {
+    assert(JNIHandles::resolve(this->at(new_index)) == NULL, "sanity");
+    // destroy the old handle
+    JNIHandles::destroy_weak_global(this->at(new_index));
+  }
+
   // Not found, push the new one, or reuse empty slot
   this->at_put_grow(new_index, mem_name_wref);
   return new_mem_name;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/arguments.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/arguments.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/arguments.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/arguments.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -3499,6 +3499,12 @@
     } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) {
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
       FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStderr", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, true);
+    } else if (match_option(option, "-XX:+ErrorFileToStdout", &tail)) {
+      FLAG_SET_CMDLINE(bool, ErrorFileToStderr, false);
+      FLAG_SET_CMDLINE(bool, ErrorFileToStdout, true);
     } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
 #if defined(DTRACE_ENABLED)
       FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/globals.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/globals.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/globals.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/globals.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -2702,6 +2702,12 @@
   product(bool, DisplayVMOutputToStdout, false,                             \
           "If DisplayVMOutput is true, display all VM output to stdout")    \
                                                                             \
+  product(bool, ErrorFileToStderr, false,                                   \
+          "If true, error data is printed to stderr instead of a file")     \
+                                                                            \
+  product(bool, ErrorFileToStdout, false,                                   \
+          "If true, error data is printed to stdout instead of a file")     \
+                                                                            \
   product(bool, UseHeavyMonitors, false,                                    \
           "use heavyweight instead of lightweight Java monitors")           \
                                                                             \
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/mutex.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/mutex.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/mutex.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/mutex.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -283,16 +283,6 @@
   return x & 0x7FFFFFFF ;
 }
 
-static inline jint MarsagliaXOR (jint * const a) {
-  jint x = *a ;
-  if (x == 0) x = UNS(a)|1 ;
-  x ^= x << 6;
-  x ^= ((unsigned)x) >> 21;
-  x ^= x << 7 ;
-  *a = x ;
-  return x & 0x7FFFFFFF ;
-}
-
 static int Stall (int its) {
   static volatile jint rv = 1 ;
   volatile int OnFrame = 0 ;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/perfData.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/perfData.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/perfData.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/perfData.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -288,7 +288,7 @@
     void *_valuep;
 
     PerfData(CounterNS ns, const char* name, Units u, Variability v);
-    ~PerfData();
+    virtual ~PerfData();
 
     // create the entry for the PerfData item in the PerfData memory region.
     // this region is maintained separately from the PerfData objects to
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/safepoint.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/safepoint.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/safepoint.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/safepoint.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -1118,6 +1118,7 @@
   if( nm->is_at_poll_return(real_return_addr) ) {
     // See if return type is an oop.
     bool return_oop = nm->method()->is_returning_oop();
+    HandleMark hm(thread());
     Handle return_value;
     if (return_oop) {
       // The oop result has been saved on the stack together with all
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/sharedRuntime.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/sharedRuntime.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/sharedRuntime.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/sharedRuntime.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -716,6 +716,7 @@
 #endif
 
   if (t == NULL) {
+    ttyLocker ttyl;
     tty->print_cr("MISSING EXCEPTION HANDLER for pc " INTPTR_FORMAT " and handler bci %d", ret_pc, handler_bci);
     tty->print_cr("   Exception:");
     exception->print();
@@ -2633,8 +2634,8 @@
     BufferBlob*  buf = buffer_blob(); // the temporary code buffer in CodeCache
     if (buf != NULL) {
       CodeBuffer buffer(buf);
-      double locs_buf[20];
-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
+      struct { double data[20]; } locs_buf;
+      buffer.insts()->initialize_shared_locs((relocInfo*)&locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
       MacroAssembler _masm(&buffer);
 
       // Fill in the signature array, for the calling-convention call.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/synchronizer.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/synchronizer.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/synchronizer.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/synchronizer.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -216,7 +216,9 @@
      }
   }
 
-  ObjectSynchronizer::inflate(THREAD, object)->exit (true, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              object,
+                              inflate_cause_vm_internal)->exit(true, THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -258,7 +260,9 @@
   // must be non-zero to avoid looking like a re-entrant lock,
   // and must not look locked either.
   lock->set_displaced_header(markOopDesc::unused_mark());
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_monitor_enter)->enter(THREAD);
 }
 
 // This routine is used to handle interpreter/compiler slow case
@@ -288,7 +292,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   return monitor->complete_exit(THREAD);
 }
@@ -301,7 +307,9 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_vm_internal);
 
   monitor->reenter(recursion, THREAD);
 }
@@ -316,7 +324,7 @@
     assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
   }
   THREAD->set_current_pending_monitor_is_from_java(false);
-  ObjectSynchronizer::inflate(THREAD, obj())->enter(THREAD);
+  ObjectSynchronizer::inflate(THREAD, obj(), inflate_cause_jni_enter)->enter(THREAD);
   THREAD->set_current_pending_monitor_is_from_java(true);
 }
 
@@ -342,7 +350,9 @@
   }
   assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
 
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj);
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj,
+                                                       inflate_cause_jni_exit);
   // If this thread has locked the object, exit the monitor.  Note:  can't use
   // monitor->check(CHECK); must exit even if an exception is pending.
   if (monitor->check(THREAD)) {
@@ -385,7 +395,10 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD, obj());
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate(THREAD,
+                                                       obj(),
+                                                       inflate_cause_wait);
+
   DTRACE_MONITOR_WAIT_PROBE(monitor, obj(), THREAD, millis);
   monitor->wait(millis, true, THREAD);
 
@@ -404,7 +417,9 @@
     TEVENT (wait - throw IAX) ;
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
   }
-  ObjectSynchronizer::inflate(THREAD, obj()) -> wait(millis, false, THREAD) ;
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_wait)->wait(millis, false, THREAD) ;
 }
 
 void ObjectSynchronizer::notify(Handle obj, TRAPS) {
@@ -417,7 +432,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notify(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notify(THREAD);
 }
 
 // NOTE: see comment of notify()
@@ -431,7 +448,9 @@
   if (mark->has_locker() && THREAD->is_lock_owned((address)mark->locker())) {
     return;
   }
-  ObjectSynchronizer::inflate(THREAD, obj())->notifyAll(THREAD);
+  ObjectSynchronizer::inflate(THREAD,
+                              obj(),
+                              inflate_cause_notify)->notifyAll(THREAD);
 }
 
 // -----------------------------------------------------------------------------
@@ -686,7 +705,7 @@
   }
 
   // Inflate the monitor to set hash code
-  monitor = ObjectSynchronizer::inflate(Self, obj);
+  monitor = ObjectSynchronizer::inflate(Self, obj, inflate_cause_hash_code);
   // Load displaced header and check it has hash code
   mark = monitor->header();
   assert (mark->is_neutral(), "invariant") ;
@@ -1183,12 +1202,29 @@
     TEVENT (omFlush) ;
 }
 
+const char* ObjectSynchronizer::inflate_cause_name(const InflateCause cause) {
+  switch (cause) {
+    case inflate_cause_vm_internal:    return "VM Internal";
+    case inflate_cause_monitor_enter:  return "Monitor Enter";
+    case inflate_cause_wait:           return "Monitor Wait";
+    case inflate_cause_notify:         return "Monitor Notify";
+    case inflate_cause_hash_code:      return "Monitor Hash Code";
+    case inflate_cause_jni_enter:      return "JNI Monitor Enter";
+    case inflate_cause_jni_exit:       return "JNI Monitor Exit";
+    default:
+      ShouldNotReachHere();
+  }
+  return "Unknown";
+}
+
 static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
-                                       const oop obj) {
+                                       const oop obj,
+                                       const ObjectSynchronizer::InflateCause cause) {
   assert(event != NULL, "invariant");
   assert(event->should_commit(), "invariant");
   event->set_monitorClass(obj->klass());
   event->set_address((uintptr_t)(void*)obj);
+  event->set_cause((u1)cause);
   event->commit();
 }
 
@@ -1200,7 +1236,9 @@
     assert(mark->monitor()->header()->is_neutral(), "monitor must record a good object header");
     return mark->monitor();
   }
-  return ObjectSynchronizer::inflate(Thread::current(), obj);
+  return ObjectSynchronizer::inflate(Thread::current(),
+                                     obj,
+                                     inflate_cause_vm_internal);
 }
 
 
@@ -1208,7 +1246,9 @@
 // multiple locks occupy the same $ line.  Padding might be appropriate.
 
 
-ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self, oop object) {
+ObjectMonitor * ATTR ObjectSynchronizer::inflate (Thread * Self,
+                                                  oop object,
+                                                  const InflateCause cause) {
   // Inflate mutates the heap ...
   // Relaxing assertion for bug 6320749.
   assert (Universe::verify_in_progress() ||
@@ -1347,7 +1387,7 @@
             }
           }
           if (event.should_commit()) {
-            post_monitor_inflate_event(&event, object);
+            post_monitor_inflate_event(&event, object, cause);
           }
           return m ;
       }
@@ -1400,7 +1440,7 @@
         }
       }
       if (event.should_commit()) {
-        post_monitor_inflate_event(&event, object);
+        post_monitor_inflate_event(&event, object, cause);
       }
       return m ;
   }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/synchronizer.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/synchronizer.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/synchronizer.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/synchronizer.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -46,6 +46,18 @@
     owner_none,
     owner_other
   } LockOwnership;
+
+  typedef enum {
+    inflate_cause_vm_internal = 0,
+    inflate_cause_monitor_enter = 1,
+    inflate_cause_wait = 2,
+    inflate_cause_notify = 3,
+    inflate_cause_hash_code = 4,
+    inflate_cause_jni_enter = 5,
+    inflate_cause_jni_exit = 6,
+    inflate_cause_nof = 7 // Number of causes
+  } InflateCause;
+
   // exit must be implemented non-blocking, since the compiler cannot easily handle
   // deoptimization at monitor exit. Hence, it does not take a Handle argument.
 
@@ -94,9 +106,10 @@
   static void omFlush   (Thread * Self) ;
 
   // Inflate light weight monitor to heavy weight monitor
-  static ObjectMonitor* inflate(Thread * Self, oop obj);
+  static ObjectMonitor* inflate(Thread * Self, oop obj, const InflateCause cause);
   // This version is only for internal use
   static ObjectMonitor* inflate_helper(oop obj);
+  static const char* inflate_cause_name(const InflateCause cause);
 
   // Returns the identity hash value for an oop
   // NOTE: It may cause monitor inflation
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/vframe.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/vframe.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/runtime/vframe.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/runtime/vframe.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -397,6 +397,7 @@
     // as it were a native compiled frame (no Java-level assumptions).
 #ifdef ASSERT
     if (WizardMode) {
+      ttyLocker ttyl;
       tty->print_cr("Error in fill_from_frame: pc_desc for "
                     INTPTR_FORMAT " not found or invalid at %d",
                     p2i(_frame.pc()), decode_offset);
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/debug.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/debug.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/debug.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/debug.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -447,12 +447,13 @@
 extern "C" void disnm(intptr_t p) {
   Command c("disnm");
   CodeBlob* cb = CodeCache::find_blob((address) p);
-  nmethod* nm = cb->as_nmethod_or_null();
-  if (nm) {
-    nm->print();
-    Disassembler::decode(nm);
-  } else {
-    cb->print();
+  if (cb != NULL) {
+    nmethod* nm = cb->as_nmethod_or_null();
+    if (nm != NULL) {
+      nm->print();
+    } else {
+      cb->print();
+    }
     Disassembler::decode(cb);
   }
 }
@@ -687,6 +688,7 @@
   tty->print_cr("  pns(void* sp, void* fp, void* pc)  - print native (i.e. mixed) stack trace. E.g.");
   tty->print_cr("                   pns($sp, $rbp, $pc) on Linux/amd64 and Solaris/amd64 or");
   tty->print_cr("                   pns($sp, $ebp, $pc) on Linux/x86 or");
+  tty->print_cr("                   pns($sp, $fp, $pc)  on Linux/AArch64 or");
   tty->print_cr("                   pns($sp, 0, $pc)    on Linux/ppc64 or");
   tty->print_cr("                   pns($sp + 0x7ff, 0, $pc) on Solaris/SPARC");
   tty->print_cr("                 - in gdb do 'set overload-resolution off' before calling pns()");
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/debug.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/debug.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/debug.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/debug.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -156,6 +156,9 @@
   #define assert_if_no_error(cond,msg)
 #endif // #ifdef ASSERT
 
+#define precond(p)   assert(p, "precond")
+#define postcond(p)  assert(p, "postcond")
+
 // guarantee is like assert except it's always executed -- use it for
 // cheap tests that catch errors that would otherwise be hard to find.
 // guarantee is also used for Verify options.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/decoder_elf.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/decoder_elf.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/decoder_elf.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/decoder_elf.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -37,7 +37,7 @@
     _opened_elf_files = NULL;
     _decoder_status = no_error;
   }
-  ~ElfDecoder();
+  virtual ~ElfDecoder();
 
   bool can_decode_C_frame_in_vm() const { return true; }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/decoder.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/decoder.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/decoder.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/decoder.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -32,6 +32,7 @@
 
 class AbstractDecoder : public CHeapObj<mtInternal> {
 public:
+  virtual ~AbstractDecoder() {}
   // status code for decoding native C frame
   enum decoder_status {
          not_available = -10,  // real decoder is not available
@@ -78,7 +79,7 @@
     _decoder_status = not_available;
   }
 
-  ~NullDecoder() {};
+  virtual ~NullDecoder() {};
 
   virtual bool decode(address pc, char* buf, int buflen, int* offset,
     const char* modulepath = NULL) {
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -29,6 +29,11 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+// Needed for INT64_C and UINT64_C with ISO C99 libraries (see JDK-8272214)
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+
 #ifdef TARGET_COMPILER_gcc
 # include "utilities/globalDefinitions_gcc.hpp"
 #endif
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions_visCPP.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions_visCPP.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/globalDefinitions_visCPP.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -77,6 +77,15 @@
 // pointer is stored as integer value.
 #define NULL_WORD NULL
 
+// Some MS Visual Studio versions do not seem to have INT64_C and UINT64_C
+// even with __STDC_CONSTANT_MACROS defined.
+#ifndef INT64_C
+#define INT64_C(c)  (c ## i64)
+#endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## ui64)
+#endif
+
 // Compiler-specific primitive types
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/hashtable.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/hashtable.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/hashtable.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/hashtable.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -94,8 +94,6 @@
   return false;
 }
 
-template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
-
 // Create a new table and using alternate hash code, populate the new table
 // with the existing elements.   This can be used to change the hash code
 // and could in the future change the size of the table.
@@ -219,7 +217,7 @@
       if (*top + entry_size() > end) {
         report_out_of_shared_space(SharedMiscData);
       }
-      *p = (BasicHashtableEntry<F>*)memcpy(*top, *p, entry_size());
+      *p = (BasicHashtableEntry<F>*)memcpy(*top, (void*)*p, entry_size());
       *top += entry_size();
     }
   }
@@ -333,7 +331,7 @@
   if (*top + len > end) {
     report_out_of_shared_space(SharedMiscData);
   }
-  _buckets = (HashtableBucket<F>*)memcpy(*top, _buckets, len);
+  _buckets = (HashtableBucket<F>*)memcpy(*top, (void*)_buckets, len);
   *top += len;
 }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/hashtable.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/hashtable.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/hashtable.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/hashtable.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -314,8 +314,8 @@
 
   // Function to move these elements into the new table.
   void move_to(RehashableHashtable<T, F>* new_table);
-  static bool use_alternate_hashcode()  { return _seed != 0; }
-  static juint seed()                    { return _seed; }
+  static bool use_alternate_hashcode();
+  static juint seed();
 
   static int literal_size(Symbol *symbol);
   static int literal_size(oop oop);
@@ -333,6 +333,9 @@
   static juint _seed;
 };
 
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::seed() { return _seed; };
+template <class T, MEMFLAGS F> bool  RehashableHashtable<T, F>::use_alternate_hashcode() { return _seed != 0; };
 
 //  Verions of hashtable where two handles are used to compute the index.
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/ostream.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/ostream.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/ostream.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/ostream.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -673,7 +673,10 @@
 static int vsnprintf_wrapper(char* buf, size_t len, const char* fmt, ...) {
   va_list args;
   va_start(args, fmt);
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
   int result = os::vsnprintf(buf, len, fmt, args);
+PRAGMA_DIAG_POP
   va_end(args);
   return result;
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/taskqueue.hpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/taskqueue.hpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/taskqueue.hpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/taskqueue.hpp	2021-10-15 03:03:52.000000000 +0000
@@ -430,9 +430,7 @@
 }
 
 template<class E, MEMFLAGS F, unsigned int N>
-GenericTaskQueue<E, F, N>::~GenericTaskQueue() {
-  FREE_C_HEAP_ARRAY(E, _elems, F);
-}
+GenericTaskQueue<E, F, N>::~GenericTaskQueue() {}
 
 // OverflowTaskQueue is a TaskQueue that also includes an overflow stack for
 // elements that do not fit in the TaskQueue.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/vmError.cpp openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/vmError.cpp
--- openjdk-8-8u292-b10/=unpacked-tar4=/src/share/vm/utilities/vmError.cpp	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/src/share/vm/utilities/vmError.cpp	2021-10-15 03:03:52.000000000 +0000
@@ -984,12 +984,16 @@
     }
   }
 
-  // print to screen
+  // Part 1: print an abbreviated version (the '#' section) to stdout.
   if (!out_done) {
     first_error->_verbose = false;
 
-    staticBufferStream sbs(buffer, sizeof(buffer), &out);
-    first_error->report(&sbs);
+    // Suppress this output if we plan to print Part 2 to stdout too.
+    // No need to have the "#" section twice.
+    if (!(ErrorFileToStdout && out.fd() == 1)) {
+      staticBufferStream sbs(buffer, sizeof(buffer), &out);
+      first_error->report(&sbs);
+    }
 
     out_done = true;
 
@@ -997,6 +1001,7 @@
     first_error->_current_step_info = "";   // reset current_step string
   }
 
+  // Part 2: print a full error log file (optionally to stdout or stderr).
   // print to error log file
   if (!log_done) {
     first_error->_verbose = true;
@@ -1004,19 +1009,26 @@
     // see if log file is already open
     if (!log.is_open()) {
       // open log file
-      int fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
-      if (fd != -1) {
-        out.print_raw("# An error report file with more information is saved as:\n# ");
-        out.print_raw_cr(buffer);
-
-        log.set_fd(fd);
+      int fd;
+      if (ErrorFileToStdout) {
+        fd = 1;
+      } else if (ErrorFileToStderr) {
+        fd = 2;
       } else {
-        out.print_raw_cr("# Can not save log file, dump to screen..");
-        log.set_fd(defaultStream::output_fd());
-        /* Error reporting currently needs dumpfile.
-         * Maybe implement direct streaming in the future.*/
-        transmit_report_done = true;
+        fd = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
+        if (fd != -1) {
+          out.print_raw("# An error report file with more information is saved as:\n# ");
+          out.print_raw_cr(buffer);
+
+        } else {
+          out.print_raw_cr("# Can not save log file, dump to screen..");
+          fd = defaultStream::output_fd();
+          /* Error reporting currently needs dumpfile.
+           * Maybe implement direct streaming in the future.*/
+          transmit_report_done = true;
+        }
       }
+      log.set_fd(fd);
     }
 
     staticBufferStream sbs(buffer, O_BUFLEN, &log);
@@ -1034,7 +1046,7 @@
       }
     }
 
-    if (log.fd() != defaultStream::output_fd()) {
+    if (log.fd() > 3) {
       close(log.fd());
     }
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+super public class TestRangeCheckExceptionHandlerLoop
+	version 51:0
+{
+
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+/* This method has an irreducible loop, with 2 entries, one is the exception handler
+
+    static void test(boolean flag, int[] array, Exception exception) throws Exception {
+        int i = 0;
+        if (flag) {
+            try {
+                throw exception;
+            } catch(Exception e) {
+                array[i] = 0;
+                i++;
+            }
+        }
+        if (i < 10) {
+            throw exception; // caught by exception handler above as well
+        }
+    }
+*/
+public static Method test:"(Z[ILjava/lang/Exception;)V"
+	throws java/lang/Exception
+	stack 3 locals 5
+{
+		iconst_0;
+		istore_3;
+		iload_0;
+		ifeq	L17;
+		try t0;
+		aload_2;
+		athrow;
+		endtry t0;
+		catch t0 java/lang/Exception;
+		catch t1 java/lang/Exception;
+		stack_frame_type full;
+		locals_map int, class "[I", class java/lang/Exception, int;
+		stack_map class java/lang/Exception;
+		astore	4;
+		aload_1;
+		iload_3;
+		iconst_0;
+		iastore;
+		iinc	3, 1;
+	L17:	stack_frame_type same;
+		iload_3;
+		bipush	10;
+		if_icmpge	L25;
+		try t1;
+		aload_2;
+		athrow;
+		endtry t1;
+	L25:	stack_frame_type same;
+		return;
+}
+} // end Class TestRangeCheckExceptionHandlerLoop
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8134883
+ * @summary C1's range check elimination breaks with a non-natural loop that an exception handler as one entry
+ * @compile TestRangeCheckExceptionHandlerLoop.jasm
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckExceptionHandlerLoopMain
+ */
+
+public class TestRangeCheckExceptionHandlerLoopMain {
+    public static void main(String[] args) throws Exception {
+        Exception exception = new Exception();
+        int[] array = new int[10];
+        for (int i = 0; i < 20000; i++) {
+            TestRangeCheckExceptionHandlerLoop.test(false, array, exception);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/stringopts/TestStringObjectInitialization.java openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/stringopts/TestStringObjectInitialization.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/stringopts/TestStringObjectInitialization.java	2021-10-15 03:03:52.000000000 +0000
@@ -59,6 +59,11 @@
         // Trigger C2's string concatenation optimization
         add(s + Arrays.toString(sArray) + " const ");
     }
+
+    public void reset() {
+        // Reset string to avoid OOMEs
+        myString = "";
+    }
 }
 
 class Runner implements Runnable {
@@ -70,8 +75,9 @@
 
     public void run(){
         String[] array = {"a", "b", "c"};
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100_000; ++i) {
             test.run("a", array);
+            test.reset();
         }
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	2021-10-15 03:03:52.000000000 +0000
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031752
  * @summary speculative traps need to be cleaned up at GC
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx512M TestSpecTrapClassUnloading
  *
  */
 
@@ -45,7 +45,7 @@
         MemoryChunk other;
         long[] array;
         MemoryChunk(MemoryChunk other) {
-            other = other;
+            this.other = other;
             array = new long[1024 * 1024 * 1024];
         }
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/arguments/TestAggressiveHeap.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/arguments/TestAggressiveHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/arguments/TestAggressiveHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/arguments/TestAggressiveHeap.java	2021-10-15 03:03:52.000000000 +0000
@@ -51,13 +51,18 @@
     // Option requires at least 256M, else error during option processing.
     private static final long minMemory = 256 * 1024 * 1024;
 
+    // Setting the heap to half of the physical memory is not suitable for
+    // a test environment with many tests running concurrently, setting to
+    // half of the required size instead.
+    private static final String heapSizeOption = "-Xmx128M";
+
     // bool UseParallelGC := true {product}
     private static final String parallelGCPattern =
         " *bool +UseParallelGC *:= *true +\\{product\\}";
 
     private static void testFlag() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-            option, "-XX:+PrintFlagsFinal", "-version");
+            option, heapSizeOption, "-XX:+PrintFlagsFinal", "-version");
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/g1/TestHumongousShrinkHeap.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/g1/TestHumongousShrinkHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/g1/TestHumongousShrinkHeap.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/g1/TestHumongousShrinkHeap.java	2021-10-15 03:03:52.000000000 +0000
@@ -49,19 +49,29 @@
     private static final int REGION_SIZE = 1024 * 1024; // 1M
     private static final int LISTS_COUNT = 10;
     private static final int HUMON_SIZE = Math.round(.9f * REGION_SIZE);
-    private static final long AVAILABLE_MEMORY
-                              = Runtime.getRuntime().freeMemory();
-    private static final int HUMON_COUNT
-                             = (int) ((AVAILABLE_MEMORY / HUMON_SIZE)
-            / LISTS_COUNT);
 
+    private static final long TOTAL_MEMORY = Runtime.getRuntime().totalMemory();
+    private static final long MAX_MEMORY = Runtime.getRuntime().maxMemory();
+
+    private static final int HUMON_COUNT = (int) ((TOTAL_MEMORY / HUMON_SIZE) / LISTS_COUNT);
 
     public static void main(String[] args) {
-        System.out.format("Running with %s max heap size. "
-                + "Will allocate humongous object of %s size %d times.%n",
-                MemoryUsagePrinter.humanReadableByteCount(AVAILABLE_MEMORY, false),
-                MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
-                HUMON_COUNT
+        if (HUMON_COUNT == 0) {
+            System.out.println("Skipped. Heap is too small");
+            return;
+        }
+
+        if (TOTAL_MEMORY + REGION_SIZE * HUMON_COUNT > MAX_MEMORY) {
+            System.out.println("Skipped. Initial heap size is to close to max heap size.");
+            return;
+        }
+
+        System.out.format("Running with %s initial heap size of %s maximum heap size. "
+                          + "Will allocate humongous object of %s size %d times.%n",
+                          MemoryUsagePrinter.humanReadableByteCount(TOTAL_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(MAX_MEMORY, false),
+                          MemoryUsagePrinter.humanReadableByteCount(HUMON_SIZE, false),
+                          HUMON_COUNT
         );
         new TestHumongousShrinkHeap().test();
     }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestChurnNotifications.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestChurnNotifications.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestChurnNotifications.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestChurnNotifications.java	2021-10-15 03:03:52.000000000 +0000
@@ -158,7 +158,12 @@
 
         System.gc();
 
-        Thread.sleep(1000);
+        // Wait until notifications start arriving, and then wait some more
+        // to catch the ones arriving late.
+        while (churnBytes.get() == 0) {
+            Thread.sleep(1000);
+        }
+        Thread.sleep(5000);
 
         long actual = churnBytes.get();
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestPauseNotifications.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestPauseNotifications.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestPauseNotifications.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/mxbeans/TestPauseNotifications.java	2021-10-15 03:03:52.000000000 +0000
@@ -142,7 +142,12 @@
             sink = new int[size];
         }
 
-        Thread.sleep(1000);
+        // Wait until notifications start arriving, and then wait some more
+        // to catch the ones arriving late.
+        while (pausesDuration.get() == 0) {
+            Thread.sleep(1000);
+        }
+        Thread.sleep(5000);
 
         long pausesActual = pausesDuration.get();
         long cyclesActual = cyclesDuration.get();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePages.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePages.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePages.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePages.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test id=default
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -Xms128m -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC          -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -Xms128m          TestLargePages
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -Xms131m -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC          -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -Xms131m          TestLargePages
+ */
+
+/*
+ * @test id=lp
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms128m -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages          -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms128m          TestLargePages
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms131m -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages          -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms131m          TestLargePages
+ */
+
+/*
+ * @test id=thp
+ * @requires os.family == "linux"
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms128m -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages          -Xmx128m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms128m          TestLargePages
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms131m -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages          -Xmx131m TestLargePages
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms131m          TestLargePages
+ */
+
+public class TestLargePages {
+    public static void main(String[] args) {
+        // Everything is checked on initialization
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePagesWithSmallHeap.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePagesWithSmallHeap.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePagesWithSmallHeap.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/shenandoah/options/TestLargePagesWithSmallHeap.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test id=default
+ * @bug 8268127
+ * @summary when heap is too small for regions to align to large page size, should fallback to regular page size
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -Xms17m         TestLargePagesWithSmallHeap
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -Xms17m         TestLargePagesWithSmallHeap
+ */
+
+/*
+ * @test id=lp
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms17m         TestLargePagesWithSmallHeap
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages -Xms17m         TestLargePagesWithSmallHeap
+ */
+
+/*
+ * @test id=thp
+ * @requires os.family == "linux"
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms17m         TestLargePagesWithSmallHeap
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms17m -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages         -Xmx17m TestLargePagesWithSmallHeap
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseTransparentHugePages -Xms17m         TestLargePagesWithSmallHeap
+ */
+
+public class TestLargePagesWithSmallHeap {
+    public static void main(String[] args) {
+        // Everything is checked on initialization
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	2021-10-15 03:03:52.000000000 +0000
@@ -97,11 +97,18 @@
                 .getActualMemoryUsage();
 
         test.allocate();
-        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD;
-             i++) {
+        for (int i = 0; i <= SurvivorAlignmentTestMain.MAX_TENURING_THRESHOLD; i++) {
             SurvivorAlignmentTestMain.WHITE_BOX.youngGC();
         }
 
+        // Sometimes we see that data unrelated to the test has been allocated during
+        // the loop. This data is included in the expectedMemoryUsage since we look
+        // through all threads to see what they allocated. If this data is still in
+        // the survivor area however, it should not be included in expectedMemoryUsage
+        // since the verification below only look at what's in tenured space.
+        expectedMemoryUsage -= SurvivorAlignmentTestMain.getAlignmentHelper(
+                                   SurvivorAlignmentTestMain.HeapSpace.SURVIVOR)
+                                   .getActualMemoryUsage();
         test.verifyMemoryUsage(expectedMemoryUsage);
     }
 }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/Makefile openjdk-8-8u312-b07/=unpacked-tar4=/test/Makefile
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/Makefile	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/Makefile	2021-10-15 03:03:52.000000000 +0000
@@ -288,6 +288,9 @@
 # Ignore tests are not run and completely silent about it
 JTREG_IGNORE_OPTION = -ignore:quiet
 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
+# Multiply by 4 the timeout factor
+JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
+JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
 # Add any extra options
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Set other vm and test options
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/8001071/Test8001071.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/8001071/Test8001071.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/8001071/Test8001071.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/8001071/Test8001071.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import sun.misc.Unsafe;
-import java.lang.reflect.Field;
-
-@SuppressWarnings("sunapi")
-public class Test8001071 {
-    public static Unsafe unsafe;
-
-    static {
-        try {
-            Field f = Unsafe.class.getDeclaredField("theUnsafe");
-            f.setAccessible(true);
-            unsafe = (Unsafe) f.get(null);
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String args[]) {
-        unsafe.getObject(new Test8001071(), Short.MAX_VALUE);
-    }
-
-}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/8001071/Test8001071.sh openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/8001071/Test8001071.sh
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/8001071/Test8001071.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/8001071/Test8001071.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-
-## @test
-## @bug 8001071
-## @summary Add simple range check into VM implemenation of Unsafe access methods 
-## @compile Test8001071.java
-## @run shell Test8001071.sh
-## @author filipp.zhinkin@oracle.com
-
-VERSION=`${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>&1`
-
-if [ -n "`echo $VERSION | grep debug`" -o -n "`echo $VERSION | grep jvmg`" ]; then
-        echo "Build type check passed"
-        echo "Continue testing"
-else
-        echo "Fastdebug build is required for this test"
-        exit 0
-fi
-
-${TESTJAVA}/bin/java -cp ${TESTCLASSES} ${TESTVMOPTS} Test8001071 2>&1
-
-HS_ERR_FILE=hs_err_pid*.log
-
-if [ ! -f $HS_ERR_FILE ]
-then
-    echo "hs_err_pid log file was not found"
-    echo "Test failed"
-    exit 1
-fi
-
-grep "assert(byte_offset < p_size) failed: Unsafe access: offset.*> object's size.*" $HS_ERR_FILE
-
-if [ "0" = "$?" ];
-then
-    echo "Range check assertion failed as expected"
-    echo "Test passed"
-    exit 0
-else
-    echo "Range check assertion was not failed"
-    echo "Test failed"
-    exit 1
-fi
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/CompressedOops/CompressedClassPointers.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/CompressedOops/CompressedClassPointers.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/CompressedOops/CompressedClassPointers.java	2021-10-15 03:03:52.000000000 +0000
@@ -44,10 +44,10 @@
         output.shouldHaveExitValue(0);
     }
 
-    public static void smallHeapTestWith3G() throws Exception {
+    public static void smallHeapTestWith1G() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "-XX:+UnlockDiagnosticVMOptions",
-            "-XX:CompressedClassSpaceSize=3g",
+            "-XX:CompressedClassSpaceSize=1g",
             "-Xmx128m",
             "-XX:+PrintCompressedOopsMode",
             "-XX:+VerifyBeforeGC", "-version");
@@ -128,7 +128,7 @@
            }
       }
       smallHeapTest();
-      smallHeapTestWith3G();
+      smallHeapTestWith1G();
       largeHeapTest();
       largePagesTest();
       sharingTest();
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/ErrorHandling/ErrorFileRedirectTest.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, SAP. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8220786
+ * @summary Test ErrorFileToStderr and ErrorFileToStdout
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.Platform;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class ErrorFileRedirectTest {
+
+  public static void do_test(boolean redirectStdout, boolean redirectStderr) throws Exception {
+
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-Xmx64M",
+            "-XX:ErrorHandlerTest=12",
+            "-XX:" + (redirectStdout ? "+" : "-") + "ErrorFileToStdout",
+            "-XX:" + (redirectStderr ? "+" : "-") + "ErrorFileToStderr",
+            "-version");
+
+    OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+    // we should have crashed with a SIGSEGV
+    output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+    output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
+
+    // If no redirection happened, we should find a mention of the file in the output.
+    String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);
+    if (redirectStdout == false && redirectStderr == false) {
+      if (hs_err_file == null) {
+        throw new RuntimeException("Expected hs-err file but none found.");
+      } else {
+        System.out.println("Found hs error file mentioned as expected: " + hs_err_file);
+      }
+    } else {
+      if (hs_err_file != null) {
+        throw new RuntimeException("Found unexpected mention of hs-err file (we did redirect the output so no file should have been written).");
+      } else {
+        System.out.println("No mention of an hs-err file - ok! ");
+      }
+    }
+
+    // Check the output. Note that since stderr was specified last it has preference if both are set.
+    if (redirectStdout == true && redirectStderr == false) {
+      output_detail.stdoutShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stderrShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stderr - ok! ");
+    } else if (redirectStderr == true) {
+      output_detail.stderrShouldContain("---------------  T H R E A D  ---------------");
+      output_detail.stdoutShouldNotContain("---------------  T H R E A D  ---------------");
+      System.out.println("Found report on stdout - ok! ");
+    }
+
+    System.out.println("OK.");
+
+  }
+
+  public static void main(String[] args) throws Exception {
+    if (!Platform.isDebugBuild()) {
+      System.out.println("Skip on non-debug builds since we need '-XX:ErrorHandlerTest'");
+      return;
+    }
+    do_test(false, false);
+    do_test(false, true);
+    do_test(true, false);
+    do_test(true, true);
+  }
+
+}
+
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/Metaspace/FragmentMetaspace.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/Metaspace/FragmentMetaspace.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/Metaspace/FragmentMetaspace.java	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/Metaspace/FragmentMetaspace.java	2021-10-15 03:03:52.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -25,7 +25,7 @@
  * @test
  * @library /runtime/testlibrary
  * @build GeneratedClassLoader
- * @run main/othervm/timeout=200 FragmentMetaspace
+ * @run main/othervm/timeout=200 -Xmx300m FragmentMetaspace
  */
 
 import java.io.IOException;
@@ -38,25 +38,34 @@
  */
 public class FragmentMetaspace {
 
+    public static Class<?> c;
+
     public static void main(String... args) {
-        runGrowing(Long.valueOf(System.getProperty("time", "80000")));
+        runGrowing(Long.valueOf(System.getProperty("time", "80000")),
+            Integer.valueOf(System.getProperty("iterations", "200")));
         // try to clean up and unload classes to decrease
         // class verification time in debug vm
         System.gc();
     }
 
-    private static void runGrowing(long time) {
+    private static void runGrowing(long time, int iterations) {
         long startTime = System.currentTimeMillis();
-        for (int i = 0; System.currentTimeMillis() < startTime + time; ++i) {
+        for (int i = 0; System.currentTimeMillis() < startTime + time && i < iterations; ++i) {
             try {
                 GeneratedClassLoader gcl = new GeneratedClassLoader();
 
-                Class<?> c = gcl.getGeneratedClasses(i, 100)[0];
+                // getGeneratedClasses throws a RuntimeException in cases where
+                // the javac exit code is not 0. If the original reason for the exception is
+                // a "java.lang.OutOfMemoryError: Java heap space",
+                // increase the heap size in the @run tag and rerun the test.
+                // The heap can be exhausted by this test, but heap exhaustion
+                // is not a failure mode of this test and should be ignored.
+                c = gcl.getGeneratedClasses(i, 100)[0];
                 c.newInstance();
                 c = null;
 
                 gcl = null;
-            } catch (IOException|InstantiationException|IllegalAccessException ex) {
+            } catch (IOException | InstantiationException | IllegalAccessException ex) {
                 throw new RuntimeException(ex);
             }
         }
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/StackGap/testme.sh openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/StackGap/testme.sh
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/StackGap/testme.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/StackGap/testme.sh	2021-10-15 03:03:52.000000000 +0000
@@ -49,7 +49,10 @@
     exit 0;
 fi
 
-CFLAGS="-m${VM_BITS}"
+if [ "x${VM_CPU}" != "xaarch64" ];
+then
+    CFLAGS="-m${VM_BITS}"
+fi
 
 LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
@@ -67,7 +70,8 @@
 $gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
-    -ljvm -lpthread exestack-gap.c
+    exestack-gap.c \
+    -ljvm -lpthread
 
 ./stack-gap || exit $?
 ./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/StackTrace/LargeClassTest.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/StackTrace/LargeClassTest.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/StackTrace/LargeClassTest.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/StackTrace/LargeClassTest.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8194246
+ * @summary JVM crashes on stack trace for large number of methods.
+ * @library /testlibrary
+ * @run main LargeClassTest
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class LargeClassTest implements Opcodes {
+    public static void main(String... args) throws Exception {
+        writeClassFile();
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "-cp", ".",  "Large");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+    }
+
+    // Writes a Large class with > signed 16 bit int methods
+    public static void writeClassFile() throws Exception {
+
+        ClassWriter cw = new ClassWriter(0);
+        FieldVisitor fv;
+        MethodVisitor mv;
+        AnnotationVisitor av0;
+
+        cw.visit(52, ACC_PUBLIC + ACC_SUPER, "Large", null, "java/lang/Object", null);
+
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(1, 1);
+          mv.visitEnd();
+        }
+        {
+          // public static void main(String[] args) {
+          //     Large large = new Large();
+          //     large.f_1(55);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+          mv.visitCode();
+          mv.visitTypeInsn(NEW, "Large");
+          mv.visitInsn(DUP);
+          mv.visitMethodInsn(INVOKESPECIAL, "Large", "<init>", "()V", false);
+          mv.visitVarInsn(ASTORE, 1);
+          mv.visitVarInsn(ALOAD, 1);
+          mv.visitIntInsn(BIPUSH, 55);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_1", "(I)I", false);
+          mv.visitInsn(POP);
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+
+        // Write 33560 methods called f_$i
+        for (int i = 1000; i < 34560; i++)
+        {
+          mv = cw.visitMethod(ACC_PUBLIC, "f_" + i, "()V", null, null);
+          mv.visitCode();
+          mv.visitInsn(RETURN);
+          mv.visitMaxs(0, 1);
+          mv.visitEnd();
+        }
+        {
+          // public int f_1(int prior) {
+          //   int total = prior + new java.util.Random(1).nextInt();
+          //   return total + f_2(total);
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_1", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitVarInsn(ILOAD, 1);
+          mv.visitTypeInsn(NEW, "java/util/Random");
+          mv.visitInsn(DUP);
+          mv.visitInsn(LCONST_1);
+          mv.visitMethodInsn(INVOKESPECIAL, "java/util/Random", "<init>", "(J)V", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/Random", "nextInt", "()I", false);
+          mv.visitInsn(IADD);
+          mv.visitVarInsn(ISTORE, 2);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitVarInsn(ALOAD, 0);
+          mv.visitVarInsn(ILOAD, 2);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "Large", "f_2", "(I)I", false);
+          mv.visitInsn(IADD);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(5, 3);
+          mv.visitEnd();
+        }
+        {
+          // public int f_2(int total) {
+          //   System.out.println(java.util.Arrays.toString(Thread.currentThread().getStackTrace()));
+          //   return 10;
+          // }
+          mv = cw.visitMethod(ACC_PUBLIC, "f_2", "(I)I", null, null);
+          mv.visitCode();
+          mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+          mv.visitMethodInsn(INVOKESTATIC, "java/lang/Thread", "currentThread", "()Ljava/lang/Thread;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Thread", "getStackTrace", "()[Ljava/lang/StackTraceElement;", false);
+          mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "toString", "([Ljava/lang/Object;)Ljava/lang/String;", false);
+          mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+          mv.visitIntInsn(BIPUSH, 10);
+          mv.visitInsn(IRETURN);
+          mv.visitMaxs(2, 2);
+          mv.visitEnd();
+        }
+        cw.visitEnd();
+
+        try (FileOutputStream fos = new FileOutputStream(new File("Large.class"))) {
+          fos.write(cw.toByteArray());
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/Unsafe/RangeCheck.java openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/Unsafe/RangeCheck.java
--- openjdk-8-8u292-b10/=unpacked-tar4=/test/runtime/Unsafe/RangeCheck.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/test/runtime/Unsafe/RangeCheck.java	2021-10-15 03:03:52.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8001071
+ * @summary Add simple range check into VM implemenation of Unsafe access methods
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+import sun.misc.Unsafe;
+
+public class RangeCheck {
+
+    public static void main(String args[]) throws Exception {
+        if (!Platform.isDebugBuild()) {
+            System.out.println("Testing assert which requires a debug build. Passing silently.");
+            return;
+        }
+
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                true,
+                "-Xmx32m",
+                "-XX:-TransmitErrorReport",
+                DummyClassWithMainRangeCheck.class.getName());
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldMatch("assert\\(byte_offset < p_size\\) failed: Unsafe access: offset \\d+ > object's size \\d+");
+    }
+
+    public static class DummyClassWithMainRangeCheck {
+        public static void main(String args[]) throws Exception {
+            Unsafe unsafe = Utils.getUnsafe();
+            unsafe.getObject(new DummyClassWithMainRangeCheck(), Short.MAX_VALUE);
+        }
+    }
+}
diff -Nru openjdk-8-8u292-b10/=unpacked-tar4=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar4=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar4=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar4=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar5=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar5=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar5=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar5=/.hg_archival.txt	2021-09-13 23:27:22.000000000 +0000
@@ -1,5 +1,5 @@
 repo: b8a1b238c77c7c00024daaa2cb7d10838e017b5f
-node: ecf358a276e9bac63cc89f2f2949fecc59a53890
+node: a3ee9cc1edc51be118b14879ce8accb087213757
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar5=/.hgtags openjdk-8-8u312-b07/=unpacked-tar5=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar5=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar5=/.hgtags	2021-09-13 23:27:22.000000000 +0000
@@ -1121,3 +1121,22 @@
 931e337c2cd5abfbcacd6097ae8fb5b3ef41508f jdk8u292-b07
 49a8f2a3868880ef94d5381964deb17fa2b4b71c jdk8u292-b08
 fcc7f620398f1b641bf7c9dc508df2f741dd5659 jdk8u292-b09
+ecf358a276e9bac63cc89f2f2949fecc59a53890 jdk8u292-b10
+ecf358a276e9bac63cc89f2f2949fecc59a53890 jdk8u292-ga
+5ee81f2d75ed549102b38ed095e0487087608780 jdk8u302-b00
+018538b21eeea91dd074a1ad9766dd85c8113b65 jdk8u302-b01
+e34f57517f19d9fea00ecd4997824277b934feaf jdk8u302-b02
+4785cae180650adc363ed24fab579bfae659f21e jdk8u302-b03
+059c39ec74bfbd0232863823e6b5163ce4895073 jdk8u302-b04
+a247af3c2e26bb3c012523536b0bba62ba08abd3 jdk8u302-b05
+a247af3c2e26bb3c012523536b0bba62ba08abd3 jdk8u312-b00
+067a65992a075f17d27d2eca47e8cc5a10eae8ed jdk8u302-b06
+1a5a89139fa02e15a5b65735037542929e942e9f jdk8u302-b07
+a69c36cf0f4f8e235bf7f4775049daab56976bc4 jdk8u302-b08
+a69c36cf0f4f8e235bf7f4775049daab56976bc4 jdk8u302-ga
+4e3edd6a47342279f864d979a168972caa01b76e jdk8u312-b01
+1d64859b8b61c9f4816e2f97e842c77bd7346dbf jdk8u312-b02
+72cdbda3c12e5f8991de72d6556a9b1ae9c21e6e jdk8u312-b03
+94e307665a04268df31b2475ace3d9c173c6e718 jdk8u312-b04
+edea31f4b06bee3ce82f5602519062d0af9c4caa jdk8u312-b05
+c0cd14e232ae509b37b6482c89e42dbd37f54488 jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar5=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar5=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar5=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar5=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/basics.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/basics.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/basics.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/basics.m4	2021-09-13 23:27:07.000000000 +0000
@@ -575,7 +575,7 @@
 
   # Xcode version will be validated later
   AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
-      [explicit path to Xcode 4 (generally for building on 10.9 and later)])],
+      [explicit path to Xcode application (generally for building on 10.9 and later)])],
       [XCODE_PATH=$with_xcode_path]
   )
 
@@ -634,9 +634,9 @@
       # is performed.
       filtered_files=`$ECHO "$files_present" \
           | $SED -e 's/config.log//g' \
-	      -e 's/confdefs.h//g' \
-	      -e 's/fixpath.exe//g' \
-	      -e 's/ //g' \
+              -e 's/configure.log//g' \
+              -e 's/confdefs.h//g' \
+              -e 's/ //g' \
           | $TR -d '\n'`
       if test "x$filtered_files" != x; then
         AC_MSG_NOTICE([Current directory is $CURDIR.])
@@ -929,3 +929,29 @@
     IS_RECONFIGURE=no
   fi
 ])
+
+# Code to run after AC_OUTPUT
+AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
+[
+  # Try to move the config.log file to the output directory.
+  if test -e ./config.log; then
+    $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
+  fi
+
+  # Rotate our log file (configure.log)
+  if test -e "$OUTPUT_ROOT/configure.log.old"; then
+    $RM -f "$OUTPUT_ROOT/configure.log.old"
+  fi
+  if test -e "$OUTPUT_ROOT/configure.log"; then
+    $MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null
+  fi
+
+  # Move configure.log from current directory to the build output root
+  if test -e ./configure.log; then
+    echo found it
+    $MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null
+  fi
+
+  # Make the compare script executable
+  $CHMOD +x $OUTPUT_ROOT/compare.sh
+])
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/configure openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/configure
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/configure	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/configure	2021-09-13 23:27:07.000000000 +0000
@@ -250,13 +250,10 @@
   set -x
 fi
 
-if test "x$conf_debug_configure" = xtrue; then
-  # Turn on logging, but don't turn on twice when called recursive
-  conf_debug_logfile=./debug-configure.log
-  (exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
-else
-  ( . $conf_script_to_run "${conf_processed_arguments[@]}" )
-fi
+# Now transfer control to the script generated by autoconf. This is where the
+# main work is done.
+conf_logfile=./configure.log
+(exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile
 
 conf_result_code=$?
 ###
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/configure.ac openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/configure.ac
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/configure.ac	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/configure.ac	2021-09-13 23:27:07.000000000 +0000
@@ -262,15 +262,11 @@
 
 # Create the actual output files. Now the main work of configure is done.
 AC_OUTPUT
-CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
-
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
-fi
 
-# Make the compare script executable
-$CHMOD +x $OUTPUT_ROOT/compare.sh
+# After AC_OUTPUT, we need to do final work
+CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
+BASIC_POST_CONFIG_OUTPUT
 
 # Finally output some useful information to the user
 HELP_PRINT_SUMMARY_AND_WARNINGS
+HELP_REPEAT_WARNINGS
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/flags.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/flags.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/flags.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/flags.m4	2021-09-13 23:27:07.000000000 +0000
@@ -175,6 +175,26 @@
       SET_SHARED_LIBRARY_NAME='-Xlinker -soname=[$]1'
       SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=[$]1'
     fi
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    PICFLAG=''
+    C_FLAG_REORDER=''
+    CXX_FLAG_REORDER=''
+
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+      # Linking is different on MacOSX
+      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
+      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
+      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
+      SET_SHARED_LIBRARY_MAPFILE=''
+    else
+      # Default works for linux, might work on other platforms as well.
+      SHARED_LIBRARY_FLAGS='-shared'
+      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
+      SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Xlinker -soname=[$]1'
+      SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=[$]1'
+    fi
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     PICFLAG="-KPIC"
     PIEFLAG=""
@@ -272,6 +292,8 @@
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     C_FLAG_DEPS="-MMD -MF"
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    C_FLAG_DEPS="-MMD -MF"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     C_FLAG_DEPS="-xMMD -xMF"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
@@ -296,6 +318,9 @@
       CXXFLAGS_DEBUG_SYMBOLS="-g"
     fi
     ASFLAGS_DEBUG_SYMBOLS="-g"
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    CFLAGS_DEBUG_SYMBOLS="-g"
+    CXXFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     CFLAGS_DEBUG_SYMBOLS="-g -xs"
     CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
@@ -352,6 +377,20 @@
         C_O_FLAG_NORM="-O2"
         C_O_FLAG_NONE="-O0"
       fi
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+        # On MacOSX we optimize for size, something
+        # we should do for all platforms?
+        C_O_FLAG_HIGHEST="-Os"
+        C_O_FLAG_HI="-Os"
+        C_O_FLAG_NORM="-Os"
+        C_O_FLAG_NONE=""
+      else
+        C_O_FLAG_HIGHEST="-O3"
+        C_O_FLAG_HI="-O3"
+        C_O_FLAG_NORM="-O2"
+        C_O_FLAG_NONE="-O0"
+      fi
     elif test "x$TOOLCHAIN_TYPE" = xxlc; then
       C_O_FLAG_HIGHEST="-O3"
       C_O_FLAG_HI="-O3 -qstrict"
@@ -477,6 +516,11 @@
         ;;
     esac
     TOOLCHAIN_CHECK_COMPILER_VERSION(6, FLAGS_SETUP_GCC6_COMPILER_FLAGS)
+    # Check that the compiler supports -Wformat-overflow flag
+    # Set USE_FORMAT_OVERFLOW to 1 if it does.
+    FLAGS_COMPILER_CHECK_ARGUMENTS([-Wformat-overflow -Werror],
+                                   [USE_FORMAT_OVERFLOW="1"], [USE_FORMAT_OVERFLOW="0"])
+    AC_SUBST([USE_FORMAT_OVERFLOW])
 
     # Check that the compiler supports -ffp-contract=off flag
     # Set FDLIBM_CFLAGS to -ffp-contract=off if it does.
@@ -645,6 +689,22 @@
       # command line.
       CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
       LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
+      # FIXME: clean this up, and/or move it elsewhere.
+
+      # Setting these parameters makes it an error to link to macosx APIs that are
+      # newer than the given OS version and makes the linked binaries compatible 
+      # even if built on a newer version of the OS.
+      # The expected format is X.Y.Z
+      MACOSX_VERSION_MIN=10.9.0
+      AC_SUBST(MACOSX_VERSION_MIN)
+    
+      # The macro takes the version with no dots, ex: 1070
+      # Let the flags variables get resolved in make for easier override on make
+      # command line.
+      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+      LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
     fi
   fi
 
@@ -696,7 +756,7 @@
     fi
     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
   else
-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc -o "x$TOOLCHAIN_TYPE" = xclang; then
       # If this is a --hash-style=gnu system, use --hash-style=both, why?
       # We have previously set HAS_GNU_HASH if this is the case
       if test -n "$HAS_GNU_HASH"; then
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/generated-configure.sh openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/generated-configure.sh
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/generated-configure.sh	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/generated-configure.sh	2021-09-13 23:27:07.000000000 +0000
@@ -687,6 +687,7 @@
 CFLAGS_JDKLIB
 MACOSX_VERSION_MIN
 FDLIBM_CFLAGS
+USE_FORMAT_OVERFLOW
 NO_LIFETIME_DSE_CFLAG
 NO_DELETE_NULL_POINTER_CHECKS_CFLAG
 LEGACY_EXTRA_ASFLAGS
@@ -1897,8 +1898,8 @@
   --with-toolchain-path   prepend these directories when searching for
                           toolchain binaries (compilers etc)
   --with-extra-path       prepend these directories to the default path
-  --with-xcode-path       explicit path to Xcode 4 (generally for building on
-                          10.9 and later)
+  --with-xcode-path       explicit path to Xcode application (generally for
+                          building on 10.9 and later)
   --with-conf-name        use this as the name of the configuration [generated
                           from important configuration options]
   --with-builddeps-conf   use this configuration file for the builddeps
@@ -3497,6 +3498,9 @@
 
 
 
+# Code to run after AC_OUTPUT
+
+
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3926,8 +3930,10 @@
 
 
 
+
+
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -4394,7 +4400,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1613496357
+DATE_WHEN_GENERATED=1625670527
 
 ###############################################################################
 #
@@ -14009,6 +14015,8 @@
     elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
       OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
     fi
+  elif test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang ; then
+    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -stdlib=libc++ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
   fi
 
 
@@ -15186,9 +15194,9 @@
       # is performed.
       filtered_files=`$ECHO "$files_present" \
           | $SED -e 's/config.log//g' \
-	      -e 's/confdefs.h//g' \
-	      -e 's/fixpath.exe//g' \
-	      -e 's/ //g' \
+              -e 's/configure.log//g' \
+              -e 's/confdefs.h//g' \
+              -e 's/ //g' \
           | $TR -d '\n'`
       if test "x$filtered_files" != x; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
@@ -25365,8 +25373,28 @@
   # Use indirect variable referencing
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
-  # First toolchain type in the list is the default
-  DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+
+  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    # On Mac OS X, default toolchain to clang after Xcode 5
+    XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
+    $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+    if test $? -ne 0; then
+      as_fn_error $? "Failed to determine Xcode version." "$LINENO" 5
+    fi
+    XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+        $SED -e 's/^Xcode \([1-9][0-9.]*\)/\1/' | \
+        $CUT -f 1 -d .`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Xcode major version: $XCODE_MAJOR_VERSION" >&5
+$as_echo "$as_me: Xcode major version: $XCODE_MAJOR_VERSION" >&6;}
+    if test $XCODE_MAJOR_VERSION -ge 5; then
+        DEFAULT_TOOLCHAIN="clang"
+    else
+        DEFAULT_TOOLCHAIN="gcc"
+    fi
+  else
+    # First toolchain type in the list is the default
+    DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+  fi
 
   if test "x$with_toolchain_type" = xlist; then
     # List all toolchains
@@ -26757,7 +26785,7 @@
   # Before we locate the compilers, we need to sanitize the Xcode build environment
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     # determine path to Xcode developer directory
-    # can be empty in which case all the tools will rely on a sane Xcode 4 installation
+    # can be empty in which case all the tools will rely on a sane Xcode installation
     SET_DEVELOPER_DIR=
 
     if test -n "$XCODE_PATH"; then
@@ -26769,7 +26797,7 @@
 $as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; }
     if test -n "$DEVELOPER_DIR"; then
       if test ! -d "$DEVELOPER_DIR"; then
-        as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5
+        as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode application bundle using --with-xcode-path" "$LINENO" 5
       fi
       if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
         as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5
@@ -26829,14 +26857,14 @@
       as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
     fi
 
-    # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
+    # Fail-fast: verify we're building on a supported Xcode version
     XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
     XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
-    if test ! "${XC_VERSION_PARTS[0]}" = "4"; then
-      as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5
+    if test "${XC_VERSION_PARTS[0]}" != "6" -a "${XC_VERSION_PARTS[0]}" != "9" -a "${XC_VERSION_PARTS[0]}" != "10" -a "${XC_VERSION_PARTS[0]}" != "11" -a "${XC_VERSION_PARTS[0]}" != "12" ; then
+      as_fn_error $? "Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select." "$LINENO" 5
     fi
 
-    # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
+    # Some versions of Xcode command line tools install gcc and g++ as symlinks to
     # clang and clang++, which will break the build. So handle that here if we need to.
     if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
       # use xcrun to find the real gcc and add it's directory to PATH
@@ -26863,7 +26891,7 @@
 
     # Perform a basic sanity test
     if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-      as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5
+      as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode using --with-xcode-path" "$LINENO" 5
     fi
 
     # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
@@ -26874,11 +26902,13 @@
       LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
     fi
 
-    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
-    # setting this here means it doesn't have to be peppered throughout the forest
-    CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+    if test -d "$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then
+      # These always need to be set on macOS 10.X, or we can't find the frameworks embedded in JavaVM.framework
+      # set this here so it doesn't have to be peppered throughout the forest
+      CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+      CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+      LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+    fi
   fi
 
   # For solaris we really need solaris tools, and not the GNU equivalent.
@@ -38693,6 +38723,381 @@
     # FIXME: we should list the discovered compilers as an exclude pattern!
     # If we do that, we can do this detection before POST_DETECTION, and still
     # find the build compilers in the tools dir, if needed.
+    if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+
+
+  # Publish this variable in the help.
+
+
+  if test "x$BUILD_CC" = x; then
+    # The variable is not set by user, try to locate tool using the code snippet
+    for ac_prog in clang cl cc gcc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CC=$ac_cv_path_BUILD_CC
+if test -n "$BUILD_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CC" && break
+done
+
+  else
+    # The variable is set, but is it from the command line or the environment?
+
+    # Try to remove the string !BUILD_CC! from our list.
+    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CC!/}
+    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+      # If it failed, the variable was not from the command line. Ignore it,
+      # but warn the user (except for BASH, which is always set by the calling BASH).
+      if test "xBUILD_CC" != xBASH; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&2;}
+      fi
+      # Try to locate tool using the code snippet
+      for ac_prog in clang cl cc gcc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CC=$ac_cv_path_BUILD_CC
+if test -n "$BUILD_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CC" && break
+done
+
+    else
+      # If it succeeded, then it was overridden by the user. We will use it
+      # for the tool.
+
+      # First remove it from the list of overridden variables, so we can test
+      # for unknown variables in the end.
+      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+      # Check if the provided tool contains a complete path.
+      tool_specified="$BUILD_CC"
+      tool_basename="${tool_specified##*/}"
+      if test "x$tool_basename" = "x$tool_specified"; then
+        # A command without a complete path is provided, search $PATH.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CC=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool BUILD_CC=$tool_basename" >&6;}
+        # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CC=$ac_cv_path_BUILD_CC
+if test -n "$BUILD_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x$BUILD_CC" = x; then
+          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+        fi
+      else
+        # Otherwise we believe it is a complete path. Use it as it is.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CC=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool BUILD_CC=$tool_specified" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CC" >&5
+$as_echo_n "checking for BUILD_CC... " >&6; }
+        if test ! -x "$tool_specified"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "User supplied tool BUILD_CC=$tool_specified does not exist or is not executable" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+      fi
+    fi
+  fi
+
+
+
+
+  # Publish this variable in the help.
+
+
+  if test "x$BUILD_CXX" = x; then
+    # The variable is not set by user, try to locate tool using the code snippet
+    for ac_prog in clang++ cl CC g++
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CXX" && break
+done
+
+  else
+    # The variable is set, but is it from the command line or the environment?
+
+    # Try to remove the string !BUILD_CXX! from our list.
+    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
+    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+      # If it failed, the variable was not from the command line. Ignore it,
+      # but warn the user (except for BASH, which is always set by the calling BASH).
+      if test "xBUILD_CXX" != xBASH; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
+      fi
+      # Try to locate tool using the code snippet
+      for ac_prog in clang++ cl CC g++
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CXX" && break
+done
+
+    else
+      # If it succeeded, then it was overridden by the user. We will use it
+      # for the tool.
+
+      # First remove it from the list of overridden variables, so we can test
+      # for unknown variables in the end.
+      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+      # Check if the provided tool contains a complete path.
+      tool_specified="$BUILD_CXX"
+      tool_basename="${tool_specified##*/}"
+      if test "x$tool_basename" = "x$tool_specified"; then
+        # A command without a complete path is provided, search $PATH.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
+        # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x$BUILD_CXX" = x; then
+          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+        fi
+      else
+        # Otherwise we believe it is a complete path. Use it as it is.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
+$as_echo_n "checking for BUILD_CXX... " >&6; }
+        if test ! -x "$tool_specified"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+      fi
+    fi
+  fi
+
+
+    else
+
 
 
   # Publish this variable in the help.
@@ -38880,6 +39285,206 @@
 
 
 
+  if test "x$BUILD_CC" = x; then
+    as_fn_error $? "Could not find required tool for BUILD_CC" "$LINENO" 5
+  fi
+
+
+
+
+
+  # Publish this variable in the help.
+
+
+  if test "x$BUILD_CXX" = x; then
+    # The variable is not set by user, try to locate tool using the code snippet
+    for ac_prog in cl CC g++
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CXX" && break
+done
+
+  else
+    # The variable is set, but is it from the command line or the environment?
+
+    # Try to remove the string !BUILD_CXX! from our list.
+    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
+    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+      # If it failed, the variable was not from the command line. Ignore it,
+      # but warn the user (except for BASH, which is always set by the calling BASH).
+      if test "xBUILD_CXX" != xBASH; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
+      fi
+      # Try to locate tool using the code snippet
+      for ac_prog in cl CC g++
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BUILD_CXX" && break
+done
+
+    else
+      # If it succeeded, then it was overridden by the user. We will use it
+      # for the tool.
+
+      # First remove it from the list of overridden variables, so we can test
+      # for unknown variables in the end.
+      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+      # Check if the provided tool contains a complete path.
+      tool_specified="$BUILD_CXX"
+      tool_basename="${tool_specified##*/}"
+      if test "x$tool_basename" = "x$tool_specified"; then
+        # A command without a complete path is provided, search $PATH.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
+        # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BUILD_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BUILD_CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BUILD_CXX=$ac_cv_path_BUILD_CXX
+if test -n "$BUILD_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
+$as_echo "$BUILD_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x$BUILD_CXX" = x; then
+          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+        fi
+      else
+        # Otherwise we believe it is a complete path. Use it as it is.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
+$as_echo_n "checking for BUILD_CXX... " >&6; }
+        if test ! -x "$tool_specified"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+      fi
+    fi
+  fi
+
+
+
+  if test "x$BUILD_CXX" = x; then
+    as_fn_error $? "Could not find required tool for BUILD_CXX" "$LINENO" 5
+  fi
+
+
+    fi
+
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 
   # First separate the path from the arguments. This will split at the first
@@ -39162,192 +39767,6 @@
   fi
 
 
-
-  # Publish this variable in the help.
-
-
-  if test "x$BUILD_CXX" = x; then
-    # The variable is not set by user, try to locate tool using the code snippet
-    for ac_prog in cl CC g++
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_CXX=$ac_cv_path_BUILD_CXX
-if test -n "$BUILD_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
-$as_echo "$BUILD_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BUILD_CXX" && break
-done
-
-  else
-    # The variable is set, but is it from the command line or the environment?
-
-    # Try to remove the string !BUILD_CXX! from our list.
-    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
-    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
-      # If it failed, the variable was not from the command line. Ignore it,
-      # but warn the user (except for BASH, which is always set by the calling BASH).
-      if test "xBUILD_CXX" != xBASH; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
-      fi
-      # Try to locate tool using the code snippet
-      for ac_prog in cl CC g++
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_CXX=$ac_cv_path_BUILD_CXX
-if test -n "$BUILD_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
-$as_echo "$BUILD_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BUILD_CXX" && break
-done
-
-    else
-      # If it succeeded, then it was overridden by the user. We will use it
-      # for the tool.
-
-      # First remove it from the list of overridden variables, so we can test
-      # for unknown variables in the end.
-      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
-      # Check if the provided tool contains a complete path.
-      tool_specified="$BUILD_CXX"
-      tool_basename="${tool_specified##*/}"
-      if test "x$tool_basename" = "x$tool_specified"; then
-        # A command without a complete path is provided, search $PATH.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
-        # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_CXX=$ac_cv_path_BUILD_CXX
-if test -n "$BUILD_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
-$as_echo "$BUILD_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        if test "x$BUILD_CXX" = x; then
-          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
-        fi
-      else
-        # Otherwise we believe it is a complete path. Use it as it is.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
-$as_echo_n "checking for BUILD_CXX... " >&6; }
-        if test ! -x "$tool_specified"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-          as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
-      fi
-    fi
-  fi
-
-
-
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 
   # First separate the path from the arguments. This will split at the first
@@ -41305,6 +41724,26 @@
       SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
       SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
     fi
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    PICFLAG=''
+    C_FLAG_REORDER=''
+    CXX_FLAG_REORDER=''
+
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+      # Linking is different on MacOSX
+      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
+      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
+      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
+      SET_SHARED_LIBRARY_MAPFILE=''
+    else
+      # Default works for linux, might work on other platforms as well.
+      SHARED_LIBRARY_FLAGS='-shared'
+      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
+      SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
+      SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
+    fi
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     PICFLAG="-KPIC"
     PIEFLAG=""
@@ -41369,6 +41808,8 @@
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     C_FLAG_DEPS="-MMD -MF"
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    C_FLAG_DEPS="-MMD -MF"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     C_FLAG_DEPS="-xMMD -xMF"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
@@ -41393,6 +41834,9 @@
       CXXFLAGS_DEBUG_SYMBOLS="-g"
     fi
     ASFLAGS_DEBUG_SYMBOLS="-g"
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    CFLAGS_DEBUG_SYMBOLS="-g"
+    CXXFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     CFLAGS_DEBUG_SYMBOLS="-g -xs"
     CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
@@ -41449,6 +41893,20 @@
         C_O_FLAG_NORM="-O2"
         C_O_FLAG_NONE="-O0"
       fi
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+        # On MacOSX we optimize for size, something
+        # we should do for all platforms?
+        C_O_FLAG_HIGHEST="-Os"
+        C_O_FLAG_HI="-Os"
+        C_O_FLAG_NORM="-Os"
+        C_O_FLAG_NONE=""
+      else
+        C_O_FLAG_HIGHEST="-O3"
+        C_O_FLAG_HI="-O3"
+        C_O_FLAG_NORM="-O2"
+        C_O_FLAG_NONE="-O0"
+      fi
     elif test "x$TOOLCHAIN_TYPE" = xxlc; then
       C_O_FLAG_HIGHEST="-O3"
       C_O_FLAG_HI="-O3 -qstrict"
@@ -41846,6 +42304,102 @@
     :
   fi
 
+    # Check that the compiler supports -Wformat-overflow flag
+    # Set USE_FORMAT_OVERFLOW to 1 if it does.
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"-Wformat-overflow -Werror\"" >&5
+$as_echo_n "checking if the C compiler supports \"-Wformat-overflow -Werror\"... " >&6; }
+  supports=yes
+
+  saved_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS -Wformat-overflow -Werror"
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int i;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CFLAGS="$saved_cflags"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+  if test "x$supports" = "xyes" ; then
+    C_COMP_SUPPORTS="yes"
+  else
+    C_COMP_SUPPORTS="no"
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"-Wformat-overflow -Werror\"" >&5
+$as_echo_n "checking if the C++ compiler supports \"-Wformat-overflow -Werror\"... " >&6; }
+  supports=yes
+
+  saved_cxxflags="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAG -Wformat-overflow -Werror"
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int i;
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CXXFLAGS="$saved_cxxflags"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+  if test "x$supports" = "xyes" ; then
+    CXX_COMP_SUPPORTS="yes"
+  else
+    CXX_COMP_SUPPORTS="no"
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"-Wformat-overflow -Werror\"" >&5
+$as_echo_n "checking if both compilers support \"-Wformat-overflow -Werror\"... " >&6; }
+  supports=no
+  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+  if test "x$supports" = "xyes" ; then
+    USE_FORMAT_OVERFLOW="1"
+  else
+    USE_FORMAT_OVERFLOW="0"
+  fi
+
+
 
     # Check that the compiler supports -ffp-contract=off flag
     # Set FDLIBM_CFLAGS to -ffp-contract=off if it does.
@@ -42125,6 +42679,22 @@
       # command line.
       CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
       LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
+      # FIXME: clean this up, and/or move it elsewhere.
+
+      # Setting these parameters makes it an error to link to macosx APIs that are
+      # newer than the given OS version and makes the linked binaries compatible
+      # even if built on a newer version of the OS.
+      # The expected format is X.Y.Z
+      MACOSX_VERSION_MIN=10.9.0
+
+
+      # The macro takes the version with no dots, ex: 1070
+      # Let the flags variables get resolved in make for easier override on make
+      # command line.
+      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+      LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
     fi
   fi
 
@@ -42176,7 +42746,7 @@
     fi
     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
   else
-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc -o "x$TOOLCHAIN_TYPE" = xclang; then
       # If this is a --hash-style=gnu system, use --hash-style=both, why?
       # We have previously set HAS_GNU_HASH if this is the case
       if test -n "$HAS_GNU_HASH"; then
@@ -42475,8 +43045,8 @@
     # Default is on if objcopy is found
     if test "x$OBJCOPY" != x; then
       ENABLE_DEBUG_SYMBOLS=true
-    # MacOS X and Windows don't use objcopy but default is on for those OSes
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
+    # AIX, MacOS X and Windows don't use objcopy but default is on for those OSes
+    elif test "x$OPENJDK_TARGET_OS" = xaix || test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
       ENABLE_DEBUG_SYMBOLS=true
     else
       ENABLE_DEBUG_SYMBOLS=false
@@ -42522,11 +43092,6 @@
 # Check whether --with-native-debug-symbols was given.
 if test "${with_native_debug_symbols+set}" = set; then :
   withval=$with_native_debug_symbols;
-        if test "x$OPENJDK_TARGET_OS" = xaix; then
-          if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
-            as_fn_error $? "AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols" "$LINENO" 5
-          fi
-        fi
 
 else
 
@@ -48851,8 +49416,12 @@
   fi
 
   # TODO better (platform agnostic) test
-  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then
-    LIBCXX="-lstdc++"
+  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x ; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      LIBCXX="-lstdc++"
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      LIBCXX="-stdlib=libc++"
+    fi
   fi
 
 
@@ -54108,14 +54677,31 @@
 fi
 
 
+# After AC_OUTPUT, we need to do final work
 
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
-fi
 
-# Make the compare script executable
-$CHMOD +x $OUTPUT_ROOT/compare.sh
+  # Try to move the config.log file to the output directory.
+  if test -e ./config.log; then
+    $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
+  fi
+
+  # Rotate our log file (configure.log)
+  if test -e "$OUTPUT_ROOT/configure.log.old"; then
+    $RM -f "$OUTPUT_ROOT/configure.log.old"
+  fi
+  if test -e "$OUTPUT_ROOT/configure.log"; then
+    $MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null
+  fi
+
+  # Move configure.log from current directory to the build output root
+  if test -e ./configure.log; then
+    echo found it
+    $MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null
+  fi
+
+  # Make the compare script executable
+  $CHMOD +x $OUTPUT_ROOT/compare.sh
+
 
 # Finally output some useful information to the user
 
@@ -54192,3 +54778,19 @@
     printf "\n"
   fi
 
+
+  # Locate config.log.
+  if test -e "./config.log"; then
+    CONFIG_LOG_PATH="."
+  fi
+
+  if test -e "$CONFIG_LOG_PATH/config.log"; then
+    $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" > /dev/null 2>&1
+    if test $? -eq 0; then
+      printf "The following warnings were produced. Repeated here for convenience:\n"
+      # We must quote sed expression (using []) to stop m4 from eating the [].
+      $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" | $SED -e  's/^configure:[0-9]*: //'
+      printf "\n"
+    fi
+  fi
+
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/help.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/help.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/help.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/help.m4	2021-09-13 23:27:07.000000000 +0000
@@ -201,7 +201,7 @@
     printf "* Environment:    $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
   fi
   printf "* Boot JDK:       $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
-  printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)\n" 
+  printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)\n"
   printf "* C Compiler:     Version $CC_VERSION_NUMBER (at $CC)\n"
   printf "* C++ Compiler:   Version $CXX_VERSION_NUMBER (at $CXX)\n"
 
@@ -249,3 +249,21 @@
     printf "\n"
   fi
 ])
+
+AC_DEFUN_ONCE([HELP_REPEAT_WARNINGS],
+[
+  # Locate config.log.
+  if test -e "./config.log"; then
+    CONFIG_LOG_PATH="."
+  fi
+
+  if test -e "$CONFIG_LOG_PATH/config.log"; then
+    $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" > /dev/null 2>&1
+    if test $? -eq 0; then
+      printf "The following warnings were produced. Repeated here for convenience:\n"
+      # We must quote sed expression (using []) to stop m4 from eating the [].
+      $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" | $SED -e [ 's/^configure:[0-9]*: //' ]
+      printf "\n"
+    fi
+  fi
+])
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/hotspot-spec.gmk.in openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/hotspot-spec.gmk.in
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/hotspot-spec.gmk.in	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/hotspot-spec.gmk.in	2021-09-13 23:27:07.000000000 +0000
@@ -118,6 +118,7 @@
 EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
 
 USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
+USE_FORMAT_OVERFLOW=@USE_FORMAT_OVERFLOW@
 
 # Universal binaries on macosx, mirror MACOSX_UNIVERSAL
 ALT_MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/jdk-options.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/jdk-options.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/jdk-options.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/jdk-options.m4	2021-09-13 23:27:07.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -659,8 +659,8 @@
     # Default is on if objcopy is found
     if test "x$OBJCOPY" != x; then
       ENABLE_DEBUG_SYMBOLS=true
-    # MacOS X and Windows don't use objcopy but default is on for those OSes
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
+    # AIX, MacOS X and Windows don't use objcopy but default is on for those OSes
+    elif test "x$OPENJDK_TARGET_OS" = xaix || test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
       ENABLE_DEBUG_SYMBOLS=true
     else
       ENABLE_DEBUG_SYMBOLS=false
@@ -698,11 +698,6 @@
       [AS_HELP_STRING([--with-native-debug-symbols],
       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
       [
-        if test "x$OPENJDK_TARGET_OS" = xaix; then
-          if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
-            AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
-          fi
-        fi
       ],
       [
         # Default to unset for backwards compatibility
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/libraries.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/libraries.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/libraries.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/libraries.m4	2021-09-13 23:27:07.000000000 +0000
@@ -1047,8 +1047,12 @@
   fi
 
   # TODO better (platform agnostic) test
-  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then
-    LIBCXX="-lstdc++"
+  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x ; then 
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      LIBCXX="-lstdc++"
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      LIBCXX="-stdlib=libc++"
+    fi
   fi
 
   AC_SUBST(LIBCXX)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/platform.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/platform.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/platform.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/platform.m4	2021-09-13 23:27:07.000000000 +0000
@@ -334,6 +334,8 @@
     elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
       OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
     fi
+  elif test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang ; then
+    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -stdlib=libc++ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
   fi
   AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS)
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/toolchain.m4 openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/toolchain.m4
--- openjdk-8-8u292-b10/=unpacked-tar6=/common/autoconf/toolchain.m4	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/common/autoconf/toolchain.m4	2021-09-13 23:27:07.000000000 +0000
@@ -149,8 +149,27 @@
   # Use indirect variable referencing
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
-  # First toolchain type in the list is the default
-  DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+ 
+  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    # On Mac OS X, default toolchain to clang after Xcode 5
+    XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
+    $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+    if test $? -ne 0; then
+      AC_MSG_ERROR([Failed to determine Xcode version.])
+    fi
+    XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+        $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
+        $CUT -f 1 -d .`
+    AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
+    if test $XCODE_MAJOR_VERSION -ge 5; then
+        DEFAULT_TOOLCHAIN="clang"
+    else
+        DEFAULT_TOOLCHAIN="gcc"
+    fi
+  else
+    # First toolchain type in the list is the default
+    DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+  fi
 
   if test "x$with_toolchain_type" = xlist; then
     # List all toolchains
@@ -238,7 +257,7 @@
   # Before we locate the compilers, we need to sanitize the Xcode build environment
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     # determine path to Xcode developer directory
-    # can be empty in which case all the tools will rely on a sane Xcode 4 installation
+    # can be empty in which case all the tools will rely on a sane Xcode installation
     SET_DEVELOPER_DIR=
 
     if test -n "$XCODE_PATH"; then
@@ -249,7 +268,7 @@
     AC_MSG_CHECKING([Determining if we need to set DEVELOPER_DIR])
     if test -n "$DEVELOPER_DIR"; then
       if test ! -d "$DEVELOPER_DIR"; then
-        AC_MSG_ERROR([Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path])
+        AC_MSG_ERROR([Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode application bundle using --with-xcode-path])
       fi
       if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
         AC_MSG_ERROR([Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle])
@@ -268,14 +287,14 @@
       AC_MSG_ERROR([The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X])
     fi
 
-    # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
+    # Fail-fast: verify we're building on a supported Xcode version
     XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
     XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
-    if test ! "${XC_VERSION_PARTS[[0]]}" = "4"; then
-      AC_MSG_ERROR([Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select.])
+    if test "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" ; then
+      AC_MSG_ERROR([Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.])
     fi
 
-    # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
+    # Some versions of Xcode command line tools install gcc and g++ as symlinks to
     # clang and clang++, which will break the build. So handle that here if we need to.
     if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
       # use xcrun to find the real gcc and add it's directory to PATH
@@ -298,7 +317,7 @@
 
     # Perform a basic sanity test
     if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-      AC_MSG_ERROR([Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path])
+      AC_MSG_ERROR([Unable to find required framework headers, provide a valid path to Xcode using --with-xcode-path])
     fi
 
     # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
@@ -308,12 +327,14 @@
       CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
       LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
     fi
-    
-    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
-    # setting this here means it doesn't have to be peppered throughout the forest
-    CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+
+    if test -d "$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then
+      # These always need to be set on macOS 10.X, or we can't find the frameworks embedded in JavaVM.framework
+      # set this here so it doesn't have to be peppered throughout the forest
+      CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+      CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+      LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+    fi
   fi
 
   # For solaris we really need solaris tools, and not the GNU equivalent.
@@ -745,9 +766,14 @@
     # FIXME: we should list the discovered compilers as an exclude pattern!
     # If we do that, we can do this detection before POST_DETECTION, and still
     # find the build compilers in the tools dir, if needed.
-    BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
+    if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+      BASIC_PATH_PROGS(BUILD_CC, [clang cl cc gcc])
+      BASIC_PATH_PROGS(BUILD_CXX, [clang++ cl CC g++])
+    else
+      BASIC_REQUIRE_PROGS(BUILD_CC, [cl cc gcc])
+      BASIC_REQUIRE_PROGS(BUILD_CXX, [cl CC g++])
+    fi
     BASIC_FIXUP_EXECUTABLE(BUILD_CC)
-    BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
     BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
     BASIC_PATH_PROGS(BUILD_LD, ld)
     BASIC_FIXUP_EXECUTABLE(BUILD_LD)
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar6=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar6=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/.hg_archival.txt	2021-09-13 23:27:07.000000000 +0000
@@ -1,5 +1,5 @@
 repo: cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d
-node: 1bdaa25d5eeb9e37b70a5795b0f4b95b3e37d3dd
+node: dcb218f54ca199de8f71d47b446efae221a39424
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/.hgtags openjdk-8-8u312-b07/=unpacked-tar6=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar6=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/.hgtags	2021-09-13 23:27:07.000000000 +0000
@@ -1049,3 +1049,22 @@
 d89ef3a0713fde8aafb81bacb78d11f92c6acdce jdk8u292-b07
 6dce56b0cce7da9e417befad574ddf702404c40d jdk8u292-b08
 0c6491b8f0e2a3b40f4c8a08d3178331a711e2b3 jdk8u292-b09
+1bdaa25d5eeb9e37b70a5795b0f4b95b3e37d3dd jdk8u292-b10
+1bdaa25d5eeb9e37b70a5795b0f4b95b3e37d3dd jdk8u292-ga
+120809c21ad7f2ba826948edc8b392ce2d6403da jdk8u302-b00
+f0e279d45d49a08815606b99698cc27dc6394714 jdk8u302-b01
+156403f25b046c586fb6752801bd7494d79ba1be jdk8u302-b02
+82610be662bc4636c689e4c5e7a7270006dda989 jdk8u302-b03
+381d5f4a839e48cd76ea2d6c86906cdde25b05bc jdk8u302-b04
+5892050572b3efb40d656ec6cdd548a443347c00 jdk8u302-b05
+5892050572b3efb40d656ec6cdd548a443347c00 jdk8u312-b00
+50e95038427217fa18fde07123cb83b0f3f29fe4 jdk8u302-b06
+26920b304bf9a6383cfa2c618580d418fd98915f jdk8u302-b07
+f7f1e6a9ee97dde65500352e0ae618d28e2cf708 jdk8u302-b08
+f7f1e6a9ee97dde65500352e0ae618d28e2cf708 jdk8u302-ga
+dc82fdcc8c4d0f3b82ce0ca61be2ffdc689dea22 jdk8u312-b01
+843da120896966cd996327933136b5a0d1f6b975 jdk8u312-b02
+34cc72c686eb3dddee1003d66d23eaf903cf4c04 jdk8u312-b03
+c75657a9389211c8f326c63abdb4ca04aca511a1 jdk8u312-b04
+f91451a251db7fdb2066aafa900a67898009c9c7 jdk8u312-b05
+7159d482bda2f43d2aa46183538e072a61f774dd jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/make/common/NativeCompilation.gmk openjdk-8-8u312-b07/=unpacked-tar6=/make/common/NativeCompilation.gmk
--- openjdk-8-8u292-b10/=unpacked-tar6=/make/common/NativeCompilation.gmk	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/make/common/NativeCompilation.gmk	2021-09-13 23:27:07.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -440,76 +440,104 @@
   ifeq ($$($1_STATIC_LIBRARY),)
     ifneq ($$($1_DEBUG_SYMBOLS),)
       ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
+        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
+          ifeq ($(OPENJDK_TARGET_OS), macosx)
+            # MacOS debug symbols are in %.dSYM directories
+            $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist : $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist
+		mkdir -p $$(@D)
+		$(CP) $$< $$@
+            $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME) : $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
+		mkdir -p $$(@D)
+		$(CP) $$< $$@
+            $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).diz : $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
+		$(CP) $$< $$@
+          else
             # The dependency on TARGET is needed on windows for debuginfo files
             # to be rebuilt properly.
             $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% $$($1_TARGET)
 		$(CP) $$< $$@
           endif
+        endif
 
-          # Generate debuginfo files.
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            ifneq ($$($1_STRIP_POLICY), no_strip)
-              $1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \
-                "-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map"
-              $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \
-                $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map
-
-              # This dependency dance ensures that windows debug info files get rebuilt
-              # properly if deleted.
-              $$($1_TARGET): $$($1_DEBUGINFO_FILES)
-              $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS)
-            endif
-          else ifeq ($(OPENJDK_TARGET_OS), solaris)
-            ifneq ($$($1_STRIP_POLICY), no_strip)
-              $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_DEBUGINFO_FILES): $$($1_TARGET) \
-                $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-			$(RM) $$@
-			$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-			$(OBJCOPY) --only-keep-debug $$< $$@
-			$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-			$(TOUCH) $$@
-            endif
-          else ifeq ($(OPENJDK_TARGET_OS), linux)
+        # Generate debuginfo files.
+        ifeq ($(OPENJDK_TARGET_OS), windows)
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \
+              "-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map"
+            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \
+              $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map
+
+            # This dependency dance ensures that windows debug info files get rebuilt
+            # properly if deleted.
+            $$($1_TARGET): $$($1_DEBUGINFO_FILES)
+            $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS)
+          endif
+        else ifeq ($(OPENJDK_TARGET_OS), solaris)
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
+            # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+            # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+            # empty section headers until a fixed $(OBJCOPY) is available.
+            # An empty section header has sh_addr == 0 and sh_size == 0.
+            # This problem has only been seen on Solaris X64, but we call this tool
+            # on all Solaris builds just in case.
+            #
+            # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+            # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+            $$($1_DEBUGINFO_FILES): $$($1_TARGET) \
+              $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
+		$(RM) $$@
+		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
+		$(TOUCH) $$@
+          endif
+        else ifeq ($(OPENJDK_TARGET_OS), linux)
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
+            $$($1_DEBUGINFO_FILES): $$($1_TARGET)
+		$(RM) $$@
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
+		$(TOUCH) $$@
+          endif
+        else ifeq ($(OPENJDK_TARGET_OS), aix)
             ifneq ($$($1_STRIP_POLICY), no_strip)
+              # AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
+              # so we copy the compiled object with symbols to the .debuginfo file, which
+              # happens prior to the STRIP on the original target object file.
               $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
               $$($1_DEBUGINFO_FILES): $$($1_TARGET)
-			$(RM) $$@
-			$(OBJCOPY) --only-keep-debug $$< $$@
-			$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-			$(TOUCH) $$@
+		$(RM) $$@
+		$(CP) $$< $$@
+		$(TOUCH) $$@
             endif
-          endif # No MacOS X support
+        else ifeq ($(OPENJDK_TARGET_OS), macosx)
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
+              $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
+            $$($1_DEBUGINFO_FILES): $$($1_TARGET)
+		$(DSYMUTIL) --out $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM $$<
+          endif
+        endif
 
-          ifeq ($(ZIP_DEBUGINFO_FILES), true)
-            ifneq ($$($1_STRIP_POLICY), no_strip)
-              $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
-              $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP))
+        ifeq ($(ZIP_DEBUGINFO_FILES), true)
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
+            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP))
 
-              # The dependency on TARGET is needed on windows for debuginfo files
-              # to be rebuilt properly.
-              $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
+            # The dependency on TARGET is needed on windows for debuginfo files
+            # to be rebuilt properly.
+            $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
 		$(CD) $$($1_OBJECT_DIR) \
 		&& $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES)
-            endif
-          else
-            ifneq ($$($1_STRIP_POLICY), no_strip)
-              $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES))
-            endif
+          endif
+        else
+          ifneq ($$($1_STRIP_POLICY), no_strip)
+            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES))
           endif
         endif
-      endif # !MacOS X
+      endif # ENABLE_DEBUG_SYMBOLS
     endif # $1_DEBUG_SYMBOLS
   endif # !STATIC_LIBRARY
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/make/Main.gmk openjdk-8-8u312-b07/=unpacked-tar6=/make/Main.gmk
--- openjdk-8-8u292-b10/=unpacked-tar6=/make/Main.gmk	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/make/Main.gmk	2021-09-13 23:27:07.000000000 +0000
@@ -178,17 +178,23 @@
 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
 	@($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
 
-# If the tests produced a $(TEST)_exitcode.txt file, use the number in that
+# If the tests produced an exitcode.txt file, use the number in that
 # file for the exit code of the "make test" invocation.
 test: images test-only
 test-only: start-make
 	@$(call TargetEnter)
 	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
 	@$(call TargetExit)
+	@$(ECHO) Testing for $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt
 	@(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \
 		EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \
 		exit $${EXIT}; \
 	  fi)
+	@$(ECHO) Testing for $(OUTPUT_ROOT)/testoutput/$(TEST)/exitcode.txt
+	@(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)/exitcode.txt ]; then \
+		EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)/exitcode.txt); \
+		exit $${EXIT}; \
+	  fi)
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
 # used to track the exact sources used to build that image.
diff -Nru openjdk-8-8u292-b10/=unpacked-tar6=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar6=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar6=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar6=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar7=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar7=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar7=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar7=/.hg_archival.txt	2021-09-13 23:27:14.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 0961a4a211765fea071b8dac419003ee0c3d5973
-node: ecdec3784f9ff3fc8889471a9942d1991610fbf6
+node: c31b33f7a368c63ddf718d3a8403a2a68b6625e6
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar7=/.hgtags openjdk-8-8u312-b07/=unpacked-tar7=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar7=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar7=/.hgtags	2021-09-13 23:27:14.000000000 +0000
@@ -1080,3 +1080,22 @@
 1d1070dabadf2778efca9a83e97fb5f2355c6666 jdk8u292-b07
 2534e08d1f087df5e3e9dd958f9eb1510e224b11 jdk8u292-b08
 a051f44ec0260e5ef9a414fe1c6d9b8833914390 jdk8u292-b09
+ecdec3784f9ff3fc8889471a9942d1991610fbf6 jdk8u292-b10
+ecdec3784f9ff3fc8889471a9942d1991610fbf6 jdk8u292-ga
+53e36820cf90d428aac8ecb7670eeaa77e4dae62 jdk8u302-b00
+8f52ab99922e0446995f6b2f2793f940e17fbd3a jdk8u302-b01
+fe47621ed0b195c2b4a323cbaa5374f96ac978f5 jdk8u302-b02
+bea49c9fc6a7902fe872797e8683712f16bd3193 jdk8u302-b03
+a3ee7e77cb8e151df46372326dec9d48943f01f7 jdk8u302-b04
+0113b64bec625aeb2a43829475311c51ba942cc1 jdk8u302-b05
+0113b64bec625aeb2a43829475311c51ba942cc1 jdk8u312-b00
+55f9e93f9393d41edc2a609b417f6a05bc6a8253 jdk8u302-b06
+29ad7b1330146fcf1a0ee60a9a82995d2f324f9a jdk8u302-b07
+eae73754c31e3109b5e8fdd9a83e6e090b5a36b9 jdk8u302-b08
+eae73754c31e3109b5e8fdd9a83e6e090b5a36b9 jdk8u302-ga
+396d9b5a44b58632fbaab0d88c598349129ca1d2 jdk8u312-b01
+9e557fa24afb36ac9cd312632a2246fdeae07c75 jdk8u312-b02
+21ceec5ba311200cea9d20a1c18e2f74adba2f7f jdk8u312-b03
+68fd93243cf383402d0fb046647c015628bd0f45 jdk8u312-b04
+869edc64d5d0c548ecb8ee56e928b9e83cb9d95b jdk8u312-b05
+70fa0fdf6a6c3ec1b362efbbc3f40632e4ae3030 jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar7=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar7=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar7=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar7=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---
 
diff -Nru openjdk-8-8u292-b10/=unpacked-tar8=/.hg_archival.txt openjdk-8-8u312-b07/=unpacked-tar8=/.hg_archival.txt
--- openjdk-8-8u292-b10/=unpacked-tar8=/.hg_archival.txt	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar8=/.hg_archival.txt	2021-09-13 23:27:08.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 55540e827aef970ecc010b7e06b912d991c8e3ce
-node: fa3e1caed3f0c0e64667ad4ba03c5fba566ddd89
+node: fc16e4d4edb472961f557d7af1c406c0542b6b5b
 branch: default
-tag: jdk8u292-b10
-tag: jdk8u292-ga
+tag: jdk8u312-b07
+tag: jdk8u312-ga
diff -Nru openjdk-8-8u292-b10/=unpacked-tar8=/.hgtags openjdk-8-8u312-b07/=unpacked-tar8=/.hgtags
--- openjdk-8-8u292-b10/=unpacked-tar8=/.hgtags	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar8=/.hgtags	2021-09-13 23:27:08.000000000 +0000
@@ -1122,3 +1122,22 @@
 b7bd2ab7cd4e48a053e3980071df0040c7e277cb jdk8u292-b07
 e871cfba551fe4fd9bc2aae297e7716591e7d9f0 jdk8u292-b08
 93fa17c348d1869c9eeefc02f3e1b76ad44b5806 jdk8u292-b09
+fa3e1caed3f0c0e64667ad4ba03c5fba566ddd89 jdk8u292-b10
+fa3e1caed3f0c0e64667ad4ba03c5fba566ddd89 jdk8u292-ga
+cae05a72a1f7ca2256af496acd34cd6ed2edcac1 jdk8u302-b00
+24d18884b6fcfac96f2c5a0a1602bd9ee8d8465c jdk8u302-b01
+905a5d49c86814de3dd3b4b36b855addf938a134 jdk8u302-b02
+f0175096381abe39a54ce573c8b5bcf41d325205 jdk8u302-b03
+08c22f2bc790bd55d9ce23cabc11851e8cc92f06 jdk8u302-b04
+d4bb92501f9b9a085ef15c907aee2d01ceaacecf jdk8u302-b05
+d4bb92501f9b9a085ef15c907aee2d01ceaacecf jdk8u312-b00
+6e8029bd8c62f34e62006fb0d4b2c288efe94abc jdk8u302-b06
+c9effa70be0a6507c1f32730adc9d819ad8a68cc jdk8u302-b07
+78fc946c11547e477446c1c825ce5ec053034508 jdk8u302-b08
+78fc946c11547e477446c1c825ce5ec053034508 jdk8u302-ga
+0c131269504a0d2f36563d4d869177e1272dcead jdk8u312-b01
+a9f336580ece8f5103a14414c86a98b76983453b jdk8u312-b02
+94a3388d19fde10d246d504dd7abc1e66b3a9139 jdk8u312-b03
+9c71a7d12e882a655a0d19e5560aff7ed09d3252 jdk8u312-b04
+899084e742deb5fd9a1dc546c8247bab6c0abe5b jdk8u312-b05
+d514245c66bd28ab58ee223bfcdeabbea602c9dc jdk8u312-b06
diff -Nru openjdk-8-8u292-b10/=unpacked-tar8=/THIRD_PARTY_README openjdk-8-8u312-b07/=unpacked-tar8=/THIRD_PARTY_README
--- openjdk-8-8u292-b10/=unpacked-tar8=/THIRD_PARTY_README	2021-03-01 10:34:41.000000000 +0000
+++ openjdk-8-8u312-b07/=unpacked-tar8=/THIRD_PARTY_README	2021-10-20 10:12:18.000000000 +0000
@@ -3243,39 +3243,75 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
-Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. All Rights Reserved.
 
-All capitalized terms in the following text have the meanings assigned to them
-in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-full Policy may be found at the OASIS website:
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
 [http://www.oasis-open.org/policies-guidelines/ipr]
 
-This document and translations of it may be copied and furnished to others, and
-derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published, and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by
-removing the copyright notice or references to OASIS, except as needed for the
-purpose of developing any document or deliverable produced by an OASIS
-Technical Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
-OF THIS DOCUMENT OR ANY PART THEREOF.
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---