JBR-2617 Text with opacity renders black

Some more adjustments in font thickness for dark text. Added JVM properties for fine tuning

.hgtags

@@ -598,18 +598,3 @@ e42c6d1a1993c720a4643140190bb1ba6f1bbf9f jdk-11.0.8+6
 59f8565ee5e224697a9e09ee2c557836733bc579 jdk-11.0.8+9
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8+10
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8-ga
-5cc275af8419178813299cc0ed81a2a85dadfdcd jdk-11.0.9+1
-3112657edde9491fb83f098f1a8b7e9275bcb2f7 jdk-11.0.9+2
-d8a0513b92ee262d4e64c1e13d43e1b3f3e5c5d5 jdk-11.0.9+3
-cb299db4a5698b814f6b3ba1f3d73d01f6a0e1f6 jdk-11.0.9+4
-55237fa85afb404bc0dc0f4948a6459d8d3e5dac jdk-11.0.9+5
-c07e785e36f587b95e151de382844cea3d1a5868 jdk-11.0.9+6
-1ba4c16a8afa3f5aaa7830fc1f14a0137cc2553b jdk-11.0.9+7
-8711e8554e15ae2fa38718d5c7dc858da10e8a4a jdk-11.0.9+8
-e872676174c7f171a9864becba83cb783cfec9d0 jdk-11.0.9+9
-6ac1b68e7c0034e08a96d7d37e93e5075a6e8d61 jdk-11.0.9+10
-4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9+11
-4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9-ga
-4fd46d208f0a4b55924af8e0c2fb6bcf46e18ec6 jdk-11.0.9.1+0
-27723943c0dd65a191cbefe031cec001521e4b13 jdk-11.0.9.1+1
-31affc22b3b5f5d43783ffadf57f22848bad9db8 jdk-11.0.9.1-ga

jb/project/java-common.cmake

@@ -29,32 +29,43 @@ add_custom_target(configure_debug
         COMMAND bash configure --disable-warnings-as-errors --enable-debug
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(JDK_RELEASE_TARGET "linux-x86_64-normal-server-release")
+  set(JDK_DEBUG_TARGET "linux-x86_64-normal-server-fastdebug")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(JDK_RELEASE_TARGET "macosx-x86_64-normal-server-release")
+    set(JDK_DEBUG_TARGET "macosx-x86_64-normal-server-fastdebug")
+    add_compile_definitions(MACOSX)
+endif ()
+
 add_custom_target(build
-        COMMAND make CONF=macosx-x86_64-normal-server-release
+        COMMAND make CONF=${JDK_RELEASE_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_images
-        COMMAND make images CONF=macosx-x86_64-normal-server-release
+        COMMAND make images CONF=${JDK_RELEASE_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_debug
-        COMMAND make CONF=macosx-x86_64-normal-server-fastdebug
+        COMMAND make CONF=${JDK_DEBUG_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_images_debug
-        COMMAND make images CONF=macosx-x86_64-normal-server-fastdebug
+        COMMAND make images CONF=${JDK_DEBUG_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(make_clean
-        COMMAND make clean CONF=macosx-x86_64-normal-server-release
+        COMMAND make clean CONF=${JDK_RELEASE_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(make_clean_debug
-        COMMAND make clean CONF=macosx-x86_64-normal-server-fastdebug
+        COMMAND make clean CONF=${JDK_DEBUG_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})

jb/project/tools/linux/scripts/mkbundles_x64.sh

@@ -6,5 +6,5 @@ build_number=$3
 script_dir=jb/project/tools/linux/scripts
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "dcevm" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "dcevm" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -16,12 +16,19 @@
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
 source jb/project/tools/common.sh
 
@@ -32,7 +39,7 @@ function create_jbr {
     JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx" | "jcef" | "dcevm")
+  "jfx" | "jcef" | "dcevm" | "nomod")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
@@ -55,7 +62,7 @@ function create_jbr {
 
   if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
     cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    rsync -av jcef_linux_x64/ $BASE_DIR/$JBR_BUNDLE/lib --exclude="modular-sdk" || exit $?
+    cp -R ${JCEF_PATH}/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
   fi
   grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
 
@@ -68,7 +75,8 @@ function create_jbr {
 }
 
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86_64-normal-server-release
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -80,35 +88,40 @@ case "$bundle_type" in
   "dcevm")
     git am jb/project/tools/patches/dcevm/*.patch
     ;;
+  "nomod")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
+    WITH_IMPORT_MODULES=""
+    ;;
 esac
 
 sh configure \
   --disable-warnings-as-errors \
-  --with-debug-level=release \
+  $WITH_DEBUG_LEVEL \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
-  --with-import-modules=./modular-sdk \
+  $WITH_IMPORT_MODULES \
   --enable-cds=yes || exit $?
 
-make images CONF=linux-x86_64-normal-server-release || exit $?
+make images CONF=$RELEASE_NAME || exit $?
 
-JSDK=build/linux-x86_64-normal-server-release/images/jdk
+JSDK=build/$RELEASE_NAME/images/jdk
 JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-BASE_DIR=build/linux-x86_64-normal-server-release/images
+BASE_DIR=build/$RELEASE_NAME/images
 JBRSDK_BUNDLE=jbrsdk
 
 rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
-  rsync -av jcef_linux_x64/ $BASE_DIR/$JBRSDK_BUNDLE/lib --exclude="modular-sdk" || exit $?
+  cp -R ${JCEF_PATH}/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...

jb/project/tools/linux/scripts/mkimages_x64_fd.sh

@@ -16,21 +16,29 @@
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
 source jb/project/tools/common.sh
 
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
 
 sh configure \
   --disable-warnings-as-errors \
-  --with-debug-level=fastdebug \
+  $WITH_DEBUG_LEVEL \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \

jb/project/tools/mac/scripts/mkbundles.sh

@@ -6,5 +6,5 @@ build_number=$3
 script_dir=jb/project/tools/mac/scripts
 ${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
 ${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
 ${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "dcevm" || exit $?
+${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

jb/project/tools/mac/scripts/mkimages.sh

@@ -16,12 +16,19 @@
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
 
 source jb/project/tools/common.sh
 
@@ -32,7 +39,7 @@ function create_jbr {
     JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx" | "jcef" | "dcevm")
+  "jfx" | "jcef" | "dcevm" | "nomod")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
@@ -64,7 +71,7 @@ function create_jbr {
 
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]; then
     rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
-    cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
+    cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
   fi
 
   echo Creating ${JBR}.tar.gz ...
@@ -75,7 +82,8 @@ function create_jbr {
 }
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=macosx-x86_64-normal-server-release
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -87,23 +95,28 @@ case "$bundle_type" in
   "dcevm")
     git am jb/project/tools/patches/dcevm/*.patch
     ;;
+  "nomod")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
+    WITH_IMPORT_MODULES=""
+    ;;
 esac
 
 sh configure \
   --disable-warnings-as-errors \
-  --with-debug-level=release \
+  $WITH_DEBUG_LEVEL \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
-  --with-import-modules=./modular-sdk \
+  $WITH_IMPORT_MODULES \
   --with-boot-jdk=`/usr/libexec/java_home -v 11` \
   --enable-cds=yes || exit $?
 
-make clean images CONF=macosx-x86_64-normal-server-release || exit $?
+make clean images CONF=$RELEASE_NAME || exit $?
 
-JSDK=build/macosx-x86_64-normal-server-release/images/jdk-bundle
+JSDK=build/$RELEASE_NAME/images/jdk-bundle
 JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
 
 BASE_DIR=jre
@@ -114,7 +127,7 @@ mkdir $BASE_DIR || exit $?
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
-  cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+  cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...

jb/project/tools/mac/scripts/mkimages_fd.sh

@@ -16,6 +16,11 @@
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
@@ -23,19 +28,23 @@ build_number=$3
 
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+
 source jb/project/tools/common.sh
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
 
 sh configure \
   --disable-warnings-as-errors \
-  --with-debug-level=fastdebug \
+  $WITH_DEBUG_LEVEL \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
-  --with-import-modules=./modular-sdk \
+  $WITH_IMPORT_MODULES \
   --with-boot-jdk=`/usr/libexec/java_home -v 11` \
   --enable-cds=yes || exit $?
 make clean CONF=macosx-x86_64-normal-server-fastdebug || exit $?
@@ -53,7 +62,7 @@ JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 echo Creating $JBSDK.tar.gz ...
-cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 
 sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
 mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
@@ -83,7 +92,7 @@ $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
 grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
 cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
 cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
-cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
+cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
 
 
 echo Creating $JBR.tar.gz ...

jb/project/tools/patches/dcevm/0001-Apply-basic-dcevm11-patch.patch

@@ -1,7 +1,7 @@
-From 7efd979183409db33e965cf80adf60c9a970c762 Mon Sep 17 00:00:00 2001
+From 4f9a0ded48f51bdfb3ed7cc18df812c456d48a8c Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:09:39 +0100
-Subject: [PATCH 01/48] Apply basic dcevm11 patch
+Subject: [PATCH 01/50] Apply basic dcevm11 patch
 
 ---
  src/hotspot/share/ci/ciObjectFactory.cpp      |   25 +
@@ -2207,7 +2207,7 @@ index 18c706187df..4533476ff8f 100644
    Symbol* signature() const                      { return constants()->symbol_at(signature_index()); }
    int signature_index() const                    { return constMethod()->signature_index();         }
 diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
-index aed6075b52a..8b0ae584cf4 100644
+index f9a69ef0c8b..231ada3f0ab 100644
 --- a/src/hotspot/share/prims/jni.cpp
 +++ b/src/hotspot/share/prims/jni.cpp
 @@ -353,6 +353,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR

jb/project/tools/patches/dcevm/0002-We-need-to-set-classRedefinitionCount-on-new-class-n.patch

@@ -1,7 +1,7 @@
-From 095315ce3f66bcf14ae1d06d84bbeb24bb068ae8 Mon Sep 17 00:00:00 2001
+From a4b2a34a6c9d477ce339bece718abe992cdd5002 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:18:22 +0100
-Subject: [PATCH 02/48] We need to set classRedefinitionCount on new class, not
+Subject: [PATCH 02/50] We need to set classRedefinitionCount on new class, not
  old class.
 
 ---

jb/project/tools/patches/dcevm/0003-Fix-crashes-in-MetadataOnStackMark-MetadataOnSta.patch

@@ -1,7 +1,7 @@
-From 9ddbbcdc73e653af7807ead68705c1c9267c9192 Mon Sep 17 00:00:00 2001
+From e5c0b2d69ab024ec0469f5c105f13f889b598815 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:22:01 +0100
-Subject: [PATCH 03/48] Fix crashes in MetadataOnStackMark::~MetadataOnSta
+Subject: [PATCH 03/50] Fix crashes in MetadataOnStackMark::~MetadataOnSta
 
 MetadataOnStackMark shoukld not remove dcevm stuff. It was added
 accidentaly in dcevm9,

jb/project/tools/patches/dcevm/0004-Fix-problem-with-nested-members.patch

@@ -1,7 +1,7 @@
-From bb3eb4931818c3ef43c48d0781d73b8e2eb6dea9 Mon Sep 17 00:00:00 2001
+From 360fbbd15357fb3cb19abc6ffb40320efadce616 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Mon, 3 Dec 2018 19:34:53 +0100
-Subject: [PATCH 04/48] Fix problem with nested members
+Subject: [PATCH 04/50] Fix problem with nested members
 
 Reported at : https://stackoverflow.com/questions/53370380/hotswapagent-incompatibleclasschangeerror-type-headerpanel1-is-not-a-nest-mem
 ---

jb/project/tools/patches/dcevm/0005-Use-init_mark_raw.patch

@@ -1,7 +1,7 @@
-From 90746a0267b2de4063667f5423093115f814bf08 Mon Sep 17 00:00:00 2001
+From 4e2aef4c3b201e9639acdd39aa9e7ecdc9fb6a86 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Mon, 10 Dec 2018 20:12:07 +0100
-Subject: [PATCH 05/48] Use init_mark_raw()
+Subject: [PATCH 05/50] Use init_mark_raw()
 
 method changed since j8 - it used init_mark()
 ---

jb/project/tools/patches/dcevm/0006-Fix-methodHandles.patch

@@ -1,7 +1,7 @@
-From 026346bfb72eaaae53e8998900d9f520da5ef74d Mon Sep 17 00:00:00 2001
+From 15194627b2573f109aef2cacc6ebfb600d0a20f0 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Thu, 13 Dec 2018 20:51:09 +0100
-Subject: [PATCH 06/48] Fix methodHandles
+Subject: [PATCH 06/50] Fix methodHandles
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-

jb/project/tools/patches/dcevm/0007-Fix-field-method.patch

@@ -1,7 +1,7 @@
-From b99ebb71bce6119cd800d69848f84281f2fd2b16 Mon Sep 17 00:00:00 2001
+From 23a83be457df96d519db8de59a49dd65731efcc4 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 15 Dec 2018 18:23:30 +0100
-Subject: [PATCH 07/48] Fix field method
+Subject: [PATCH 07/50] Fix field method
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++-------

jb/project/tools/patches/dcevm/0008-Fix-nonstatic-field-handles.patch

@@ -1,7 +1,7 @@
-From dd57a1b40a83f7691c0fb9aa960f77c4428c0eec Mon Sep 17 00:00:00 2001
+From 1fe56253f7e63d69f9a12963316889c5e87111eb Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 15 Dec 2018 20:16:37 +0100
-Subject: [PATCH 08/48] Fix nonstatic field handles
+Subject: [PATCH 08/50] Fix nonstatic field handles
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 7 ++++++-

jb/project/tools/patches/dcevm/0009-Support-for-Concurrent-Mark-Sweep-CMS-collector.patch

@@ -1,7 +1,7 @@
-From 333c0c639e12296d05a547b015c948516c8c504e Mon Sep 17 00:00:00 2001
+From cbe52ffcde1851f2c3527825f37145428aeedc67 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 12 Dec 2018 19:38:28 +0100
-Subject: [PATCH 09/48] Support for Concurrent Mark Sweep (CMS) collector
+Subject: [PATCH 09/50] Support for Concurrent Mark Sweep (CMS) collector
 
 ---
  .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------

jb/project/tools/patches/dcevm/0010-Code-cleanup.patch

@@ -1,7 +1,7 @@
-From b9ceda6f7c230750a87e8a686d833ce853d84712 Mon Sep 17 00:00:00 2001
+From 11d10158d77512795b1b8ab8378620b95b67f175 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 13:22:29 +0100
-Subject: [PATCH 10/48] Code cleanup
+Subject: [PATCH 10/50] Code cleanup
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 125 ++++++------------

jb/project/tools/patches/dcevm/0011-Fix-check_class.patch

@@ -1,7 +1,7 @@
-From 1d147a5db94b531fa027d5e13e4dd5cbaef62952 Mon Sep 17 00:00:00 2001
+From 1765f4c1b2e8958b458fa17d329be98ad025069c Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 16:05:25 +0100
-Subject: [PATCH 11/48] Fix check_class
+Subject: [PATCH 11/50] Fix check_class
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 39 +++++++------------

jb/project/tools/patches/dcevm/0012-Fix-force_forward-in-dead-space.patch

@@ -1,7 +1,7 @@
-From 84777c09ddbbbbd6a90de5b1f17a4101c8f076b8 Mon Sep 17 00:00:00 2001
+From 0851d437a65dc9ac6d8355b54689d36e77e104b3 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 17:58:39 +0100
-Subject: [PATCH 12/48] Fix force_forward in dead space
+Subject: [PATCH 12/50] Fix force_forward in dead space
 
 ---
  src/hotspot/share/gc/shared/space.inline.hpp | 1 +

jb/project/tools/patches/dcevm/0013-Cleanup.patch

@@ -1,7 +1,7 @@
-From 4d973861fbcd13dc50bd603f731c75d2013034c6 Mon Sep 17 00:00:00 2001
+From 35aba247d8a3e25f5d19403ba5f293bfdaf6539c Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Fri, 1 Mar 2019 18:45:13 +0100
-Subject: [PATCH 13/48] Cleanup
+Subject: [PATCH 13/50] Cleanup
 
 ---
  src/hotspot/share/gc/shared/space.cpp | 2 +-

jb/project/tools/patches/dcevm/0014-Add-codecache-flush-optimization-but-just-flush-all-.patch

@@ -1,7 +1,7 @@
-From 5f31460556d86fa0233e7998112a65483034fd45 Mon Sep 17 00:00:00 2001
+From 26a5079eb61a2e23328fbd8ca59ffc2ab6b6193b Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 17:38:27 +0100
-Subject: [PATCH 14/48] Add codecache flush optimization, but just flush all
+Subject: [PATCH 14/50] Add codecache flush optimization, but just flush all
  cache.
 
 Redefined class can define a new method that overrides

jb/project/tools/patches/dcevm/0015-HotswapAgent-integration.patch

@@ -1,7 +1,7 @@
-From d457702275bc47f3f9ea416dc794be403bc6eb94 Mon Sep 17 00:00:00 2001
+From 24a60477aef7098ea23ab50a573332957741ea7b Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:20:08 +0100
-Subject: [PATCH 15/48] HotswapAgent integration
+Subject: [PATCH 15/50] HotswapAgent integration
 
 It include:
 

jb/project/tools/patches/dcevm/0016-Add-dcevm-distro-name.patch

@@ -1,7 +1,7 @@
-From 603b446449aa715aa3f409fb49ed00169b89fd91 Mon Sep 17 00:00:00 2001
+From dc397b652d9810f6f261070afbb8519f1c2964ee Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sun, 16 Dec 2018 09:55:31 +0100
-Subject: [PATCH 16/48] Add dcevm distro name
+Subject: [PATCH 16/50] Add dcevm distro name
 
 ---
  make/autoconf/version-numbers | 2 +-

jb/project/tools/patches/dcevm/0017-java.desktop-com.sun.beans-ALL-UNNAMED.patch

@@ -1,7 +1,7 @@
-From 6869b6f67f8c8db57d91ea0ef9f33aaf44def1db Mon Sep 17 00:00:00 2001
+From 987645d54a6682f28a733731965d6b377e892974 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 Nov 2019 19:58:27 +0100
-Subject: [PATCH 17/48] java.desktop/com.sun.beans=ALL-UNNAMED
+Subject: [PATCH 17/50] java.desktop/com.sun.beans=ALL-UNNAMED
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0018-increment_class_counter-using-orig-dcevm-code.patch

@@ -1,7 +1,7 @@
-From bbcbaa9d5814017565b8f7f0d86844e9f64905c1 Mon Sep 17 00:00:00 2001
+From 60569257636a2d0b31b04ab2638d81f840d75e58 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 Nov 2019 21:07:59 +0100
-Subject: [PATCH 18/48] increment_class_counter() using orig dcevm code
+Subject: [PATCH 18/50] increment_class_counter() using orig dcevm code
 
 Probably it is cause of SISEGV on:
 _

jb/project/tools/patches/dcevm/0019-Allow-11715ha-class-initializer-calls.patch

@@ -1,7 +1,7 @@
-From 62c65c226bbc4fadbc598db1a2ac7d05d17ae731 Mon Sep 17 00:00:00 2001
+From 41d2963b54490601e22cf5309ed73f78566d35ae Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 21 Nov 2019 19:30:07 +0100
-Subject: [PATCH 19/48] Allow 11715ha class initializer calls
+Subject: [PATCH 19/50] Allow 11715ha class initializer calls
 
 ---
  src/hotspot/share/classfile/vmSymbols.hpp      | 1 +

jb/project/tools/patches/dcevm/0020-Disable-HA-in-keytool.patch

@@ -1,7 +1,7 @@
-From 88b6f7a27e35d9ed3b82418b82c1cb1fe14f61e6 Mon Sep 17 00:00:00 2001
+From 09799f079ef1148248ca60c917205003d2a565b3 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 26 Nov 2019 22:13:07 +0100
-Subject: [PATCH 20/48] Disable HA in keytool
+Subject: [PATCH 20/50] Disable HA in keytool
 
 ---
  make/launcher/Launcher-java.base.gmk | 1 +

jb/project/tools/patches/dcevm/0021-Open-jdk-module-to-access-ClassInfo.CACHE.patch

@@ -1,7 +1,7 @@
-From 7fb12fc40a76a37ce67b051276a7ef582de1b04a Mon Sep 17 00:00:00 2001
+From e1d8f42f428d7d18f09f1a7098f56fdce808c3fe Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 28 Nov 2019 18:53:11 +0100
-Subject: [PATCH 21/48] Open jdk module to access ClassInfo.CACHE
+Subject: [PATCH 21/50] Open jdk module to access ClassInfo.CACHE
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0022-Open-java.base-java.io-module.patch

@@ -1,7 +1,7 @@
-From d3d53f242337bd3bc79917f922ff569c0a112f3b Mon Sep 17 00:00:00 2001
+From 8b7323c57ee07c03a02ba951ce6d453ec4cc1a54 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 8 Dec 2019 17:55:01 +0100
-Subject: [PATCH 22/48] Open java.base/java.io module
+Subject: [PATCH 22/50] Open java.base/java.io module
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0023-Fix-fieldDescriptor.inline.hpp.patch

@@ -1,7 +1,7 @@
-From 833ef503677e066b3639e7418a22587992df1829 Mon Sep 17 00:00:00 2001
+From 14c82a29cbf8254f8da626753ea34086d38e71b4 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Fri, 6 Mar 2020 09:28:24 +0100
-Subject: [PATCH 23/48] Fix fieldDescriptor.inline.hpp
+Subject: [PATCH 23/50] Fix fieldDescriptor.inline.hpp
 
 ---
  .../share/prims/jvmtiEnhancedRedefineClasses.cpp       | 10 ++++++----

jb/project/tools/patches/dcevm/0024-Fix-clear_cpool_cache.patch

@@ -1,7 +1,7 @@
-From 1af8b1f3f891388a37cc71076c324d3905ab2a46 Mon Sep 17 00:00:00 2001
+From 5a56f2278c0a79f4a26f369a55f4c1c4dab2621e Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Fri, 6 Mar 2020 15:46:51 +0100
-Subject: [PATCH 24/48] Fix clear_cpool_cache
+Subject: [PATCH 24/50] Fix clear_cpool_cache
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 8 +++-----

jb/project/tools/patches/dcevm/0025-Refactor-ClearCpoolCacheAndUnpatch.patch

@@ -1,7 +1,7 @@
-From def550828411b677ed2d7807e51cc5ffe70331fc Mon Sep 17 00:00:00 2001
+From c1aafaafaf15780d6bca1312162d551da4f63036 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Mon, 9 Mar 2020 09:54:04 +0100
-Subject: [PATCH 25/48] Refactor ClearCpoolCacheAndUnpatch
+Subject: [PATCH 25/50] Refactor ClearCpoolCacheAndUnpatch
 
 Call it after redefinition of all classes
 ---

jb/project/tools/patches/dcevm/0026-Fix-class-cast-exception-on-redefinition-of-class-A-.patch

@@ -1,7 +1,7 @@
-From 5f416d7a25bd23399b9189cc94ab5d5887e6b4d4 Mon Sep 17 00:00:00 2001
+From d6a3286b9b57df4c09d859e38833f2e3dc1574d9 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Wed, 11 Mar 2020 14:19:34 +0100
-Subject: [PATCH 26/48] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 26/50] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---

jb/project/tools/patches/dcevm/0027-Update-klass-reference-in-Klass.implementor.patch

@@ -1,7 +1,7 @@
-From 9a7abdf08bf207f5265a552500446c3178bf5794 Mon Sep 17 00:00:00 2001
+From a4ab453f532839ea3b09027736bb6e74d288bf1d Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 10 Apr 2020 23:28:07 +0200
-Subject: [PATCH 27/48] Update klass reference in Klass.implementor()
+Subject: [PATCH 27/50] Update klass reference in Klass.implementor()
 
 If interface X is removed from class Y then old reference to Y could be
 stored in X.implementor()

jb/project/tools/patches/dcevm/0028-Fix-DirectMethodHandle-accessors-klasses.patch

@@ -1,7 +1,7 @@
-From 8f13d3b4ba9aecd847b7da306055ba53ee2e29d0 Mon Sep 17 00:00:00 2001
+From 015c9c88e63f2dde4b8b2a09d2832a8c2a3caf25 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 10 Apr 2020 23:30:21 +0200
-Subject: [PATCH 28/48] Fix DirectMethodHandle accessors klasses
+Subject: [PATCH 28/50] Fix DirectMethodHandle accessors klasses
 
 ---
  src/hotspot/share/classfile/javaClasses.cpp | 28 +++++++++++++++------

jb/project/tools/patches/dcevm/0029-cleanup-direct-method-handles-code.patch

@@ -1,7 +1,7 @@
-From cbad9c34bf8920d772c646d041d4fc04fea203cc Mon Sep 17 00:00:00 2001
+From 14005f6176420c16fa1d152c78a3dacd26ecb647 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 11 Apr 2020 12:07:43 +0200
-Subject: [PATCH 29/48] cleanup direct method handles code
+Subject: [PATCH 29/50] cleanup direct method handles code
 
 ---
  src/hotspot/share/classfile/javaClasses.hpp        | 10 ++++------

jb/project/tools/patches/dcevm/0030-Add-init_implementor_from_redefine-that-skips-compil.patch

@@ -1,7 +1,7 @@
-From e3b94671ce5108a91e3a3e92b01eea07731c7639 Mon Sep 17 00:00:00 2001
+From 990ffe4111fe73c3a183f8d35402cbf9e81bd587 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 11 Apr 2020 17:52:13 +0200
-Subject: [PATCH 30/48] Add init_implementor_from_redefine, that skips compiler
+Subject: [PATCH 30/50] Add init_implementor_from_redefine, that skips compiler
  lock assert
 
 ---

jb/project/tools/patches/dcevm/0031-not-nullable-oop_store_not_null-method-handle-NULL-i.patch

@@ -1,7 +1,7 @@
-From a95c3daf0a1db23e2dcc977f427faa7be41007c9 Mon Sep 17 00:00:00 2001
+From 9dcddc7c2573c34579161e3ad1240b029dda1e96 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Mon, 13 Apr 2020 20:59:35 +0200
-Subject: [PATCH 31/48] not nullable oop_store_not_null() method+handle NULL in
+Subject: [PATCH 31/50] not nullable oop_store_not_null() method+handle NULL in
  mem_name in dmh
 
 ---

jb/project/tools/patches/dcevm/0032-add-jvmtiEnhancedRedefineClasses.-to-CMakeLists.txt.patch

@@ -1,7 +1,7 @@
-From 15690197a276a86054e1ec9724c877d6d871ca01 Mon Sep 17 00:00:00 2001
+From 800b44f545c7b99026d203690def30ec4b9ed08e Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Tue, 14 Apr 2020 19:11:35 +0200
-Subject: [PATCH 32/48] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+Subject: [PATCH 32/50] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
 
 ---
  jb/project/hotspot-cmake/CMakeLists.txt | 2 ++

jb/project/tools/patches/dcevm/0033-migrate-DCEVM-to-11.0.7.patch

@@ -1,7 +1,7 @@
-From dab6a53de4c25aae95667c78b8e1f1097ab47130 Mon Sep 17 00:00:00 2001
+From e009b4fcc48e9719b5b896f7f3838fbc7c579ba7 Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Sun, 19 Apr 2020 11:36:12 +0200
-Subject: [PATCH 33/48] migrate DCEVM to 11.0.7
+Subject: [PATCH 33/50] migrate DCEVM to 11.0.7
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-

jb/project/tools/patches/dcevm/0034-Fix-11.0.7-compilation-issues.patch

@@ -1,7 +1,7 @@
-From 70d53ce28f9df75d9e50819d2b6654855da0d533 Mon Sep 17 00:00:00 2001
+From 5653e2a5f05a9693f934b0f9c4d9286c01576807 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 8 May 2020 21:07:50 +0200
-Subject: [PATCH 34/48] Fix 11.0.7 compilation issues
+Subject: [PATCH 34/50] Fix 11.0.7 compilation issues
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 3 ++-

jb/project/tools/patches/dcevm/0035-Use-INCLUDE_CDS-condition-on-UseSharedSpaces-block-f.patch

@@ -1,7 +1,7 @@
-From 805b588bc4bd45e61b81c90e23b71337072e9549 Mon Sep 17 00:00:00 2001
+From 0b9b021f889ec001d579d192f1bd9a7a43f63871 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 9 May 2020 10:08:17 +0200
-Subject: [PATCH 35/48] Use INCLUDE_CDS condition on "UseSharedSpaces" block
+Subject: [PATCH 35/50] Use INCLUDE_CDS condition on "UseSharedSpaces" block
  from master
 
 ---

jb/project/tools/patches/dcevm/0036-Access-com.sun.beans.util-HotswapAgent-patch.patch

@@ -1,7 +1,7 @@
-From 78619004206d224b319d68493672bee2c97f0946 Mon Sep 17 00:00:00 2001
+From 9f4b84339b55187b742682bd84fdb0e6e121917c Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 16 May 2020 15:11:40 +0200
-Subject: [PATCH 36/48] Access com.sun.beans.util - HotswapAgent patch
+Subject: [PATCH 36/50] Access com.sun.beans.util - HotswapAgent patch
 
 ---
  src/hotspot/share/runtime/arguments.cpp       |  2 ++

jb/project/tools/patches/dcevm/0037-Skip-verifier-only-in-AllowEnhancedClassRedefinition.patch

@@ -1,7 +1,7 @@
-From baf26456579eb0e560471d3bcb150005492f69f4 Mon Sep 17 00:00:00 2001
+From 9a662b1367860920095efe79116ef9a2d53fc2c6 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 17 May 2020 12:19:18 +0200
-Subject: [PATCH 37/48] Skip verifier only in AllowEnhancedClassRedefinition
+Subject: [PATCH 37/50] Skip verifier only in AllowEnhancedClassRedefinition
 
 ---
  src/hotspot/share/oops/instanceKlass.cpp | 4 ++--

jb/project/tools/patches/dcevm/0038-Use-original-code-for-adjust_method_entries-in-stand.patch

@@ -1,7 +1,7 @@
-From 46dc38a58ac8afafab4e04ee47a1ed2b9e65c1e1 Mon Sep 17 00:00:00 2001
+From a58ed678218bfb80af164cfe98cdf4a3ab74a682 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 17 May 2020 18:18:52 +0200
-Subject: [PATCH 38/48] Use original code for adjust_method_entries in standard
+Subject: [PATCH 38/50] Use original code for adjust_method_entries in standard
  redefinition
 
 ---

jb/project/tools/patches/dcevm/0039-Revert-code-for-AllowEnhancedClassRedefinition.patch

@@ -1,7 +1,7 @@
-From 6ac099d1b07fcc0d3c17ebd5d3335bcb6ceaedc9 Mon Sep 17 00:00:00 2001
+From c1e814f2f7d4f2b37abd667d0bec516474f2a119 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 09:41:36 +0200
-Subject: [PATCH 39/48] Revert code for !AllowEnhancedClassRedefinition
+Subject: [PATCH 39/50] Revert code for !AllowEnhancedClassRedefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       | 23 ++++++++++---------

jb/project/tools/patches/dcevm/0040-Code-cleanup.patch

@@ -1,7 +1,7 @@
-From de04154ee21d33c1ac1b74b2740f2fda117c0430 Mon Sep 17 00:00:00 2001
+From 5b36c4798869c5cd4d65f7765a8447b9cf09d76b Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 09:29:39 +0200
-Subject: [PATCH 40/48] Code cleanup
+Subject: [PATCH 40/50] Code cleanup
 
 ---
  src/hotspot/share/classfile/classFileParser.cpp   |  4 +++-

jb/project/tools/patches/dcevm/0041-Activate-cpCache-definition-asserts-for-dcevm.patch

@@ -1,7 +1,7 @@
-From ab8888737eaed76776b41b28af93a0c47826b8d6 Mon Sep 17 00:00:00 2001
+From 71f35c41b569f72a1674ccd57118c4fe76ba3d68 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 10:31:15 +0200
-Subject: [PATCH 41/48] Activate cpCache definition asserts for !dcevm
+Subject: [PATCH 41/50] Activate cpCache definition asserts for !dcevm
 
 ---
  src/hotspot/share/oops/cpCache.cpp | 6 ++----

jb/project/tools/patches/dcevm/0042-iterate-old-method-version-only-in-dcevm.patch

@@ -1,7 +1,7 @@
-From 8596cf8b677eadcd18b527dd61c891475758bbaa Mon Sep 17 00:00:00 2001
+From 961018a29ddb7eba96aca7fbc385f3c4f29e3a03 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 10:54:38 +0200
-Subject: [PATCH 42/48] iterate old method version only in dcevm
+Subject: [PATCH 42/50] iterate old method version only in dcevm
 
 ---
  src/hotspot/share/prims/jvmtiImpl.cpp | 6 ++++--

jb/project/tools/patches/dcevm/0043-Support-for-Lambda-class-redefinition.patch

@@ -1,7 +1,7 @@
-From f3c1667fc04abdd9aa556b2c00a23239eba14287 Mon Sep 17 00:00:00 2001
+From 2ab70b495c43c4699ad402a714710566400de99d Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 22 May 2020 21:23:01 +0200
-Subject: [PATCH 43/48] Support for Lambda class redefinition
+Subject: [PATCH 43/50] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++

jb/project/tools/patches/dcevm/0044-Skip-GC-runs-for-redefinitions-without-instance-size.patch

@@ -1,7 +1,7 @@
-From b8a3d4249eb97613f796edc709e414900c9a0828 Mon Sep 17 00:00:00 2001
+From 3f53bb48682b17cfbf4781d4fa47055be88baea0 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 22 May 2020 21:43:22 +0200
-Subject: [PATCH 44/48] Skip GC runs for redefinitions without instance size
+Subject: [PATCH 44/50] Skip GC runs for redefinitions without instance size
  change
 
 ---

jb/project/tools/patches/dcevm/0045-Fix-no-original-bytecode-found-error-if-method-with-.patch

@@ -1,7 +1,7 @@
-From 77bdf6253c457ed88436fb4da6a53c7c0c361a1c Mon Sep 17 00:00:00 2001
+From d0d6602fe3d664cb2322d7066bf46fa7e20d5d4e Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 45/48] Fix "no original bytecode found" error if method with
+Subject: [PATCH 45/50] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has

jb/project/tools/patches/dcevm/0046-Fix-comments-according-hotspot-formatting-convention.patch

@@ -1,7 +1,7 @@
-From d3371d7d52bd4dc66efd4f6a946d5045b8bc8b2b Mon Sep 17 00:00:00 2001
+From 585f1cb56766be837a34114b1ee5c743aa4e6801 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:17:56 +0200
-Subject: [PATCH 46/48] Fix comments according hotspot formatting conventions
+Subject: [PATCH 46/50] Fix comments according hotspot formatting conventions
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 191 +++++++-----------

jb/project/tools/patches/dcevm/0047-Review-threads-cleanup.patch

@@ -1,7 +1,7 @@
-From 2ad306a4cce06cfccf95a1193daf5b968ec1fa87 Mon Sep 17 00:00:00 2001
+From 79c80c48da4d52f4616f1c6ef37e838d29be9be1 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:09 +0200
-Subject: [PATCH 47/48] Review threads, cleanup
+Subject: [PATCH 47/50] Review threads, cleanup
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 9 ++++-----

jb/project/tools/patches/dcevm/0048-Replace-deleted-method-with-Universe-throw_no_such_m.patch

@@ -1,7 +1,7 @@
-From a5586aff03fde654102e2c2e1fc19fdea406b31e Mon Sep 17 00:00:00 2001
+From 8b79e673a3a9d12c97b8b7dd2f4d79c2d4cdd1d6 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:42 +0200
-Subject: [PATCH 48/48] Replace deleted method with
+Subject: [PATCH 48/50] Replace deleted method with
  Universe::throw_no_such_method_error
 
 ---

jb/project/tools/patches/dcevm/0050-G1-Heap-parallel-iterate-method-object_par_iterate-d.patch

@@ -0,0 +1,214 @@
+From 55e30de9a54b2f3bec995a2df42fe14b09d16f06 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 21 Jun 2020 13:38:45 +0200
+Subject: [PATCH 50/50] G1 Heap parallel iterate method "object_par_iterate" +
+ dcevm timers
+
+G1 Heap does not have parallel iterate method, that is usefull in dcevm
+iterate phase. According performance tests the parallel iteration is up
+~25% faster then serial iteration, ratio depends on the size of heap.
+Dcevm's timers did not make sense. Now, there are timers fo prologue,
+doit, gc itarate and full gc phases. Iterate+fullgc time make up most
+the total doit time.
+---
+ src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 20 ++++++++
+ src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 46 +++++++++++++------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  5 +-
+ 4 files changed, 58 insertions(+), 15 deletions(-)
+
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+index dea8d9fdb0e..33664a30519 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+@@ -2108,6 +2108,21 @@ public:
+   }
+ };
+ 
++class G1IterateObjectClosureTask : public AbstractGangTask {
++ private:
++  ObjectClosure* _cl;
++  G1CollectedHeap* _g1h;
++  HeapRegionClaimer _hrclaimer;
++ public:
++  G1IterateObjectClosureTask(ObjectClosure* cl, G1CollectedHeap* g1h) : AbstractGangTask("IterateObject Closure"),
++    _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
++
++  virtual void work(uint worker_id) {
++    IterateObjectClosureRegionClosure blk(_cl);
++    _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
++  }
++};
++
+ void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
+   IterateObjectClosureRegionClosure blk(cl);
+   heap_region_iterate(&blk);
+@@ -2117,6 +2132,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+   _hrm.iterate(cl);
+ }
+ 
++void G1CollectedHeap::object_par_iterate(ObjectClosure* cl) {
++  G1IterateObjectClosureTask iocl_task(cl, this);
++  workers()->run_task(&iocl_task);
++}
++
+ void G1CollectedHeap::heap_region_par_iterate_from_worker_offset(HeapRegionClosure* cl,
+                                                                  HeapRegionClaimer *hrclaimer,
+                                                                  uint worker_id) const {
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+index 0735eef0da8..05a068bb2e0 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+@@ -1117,6 +1117,8 @@ public:
+ 
+   // Iteration functions.
+ 
++  void object_par_iterate(ObjectClosure* cl);
++
+   // Iterate over all objects, calling "cl.do_object" on each.
+   virtual void object_iterate(ObjectClosure* cl);
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 32929b3d7a0..5be9bb74305 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -54,6 +54,7 @@
+ #include "utilities/events.hpp"
+ #include "oops/constantPool.inline.hpp"
+ #include "gc/cms/cmsHeap.hpp"
++#include "gc/g1/g1CollectedHeap.hpp"
+ #include "gc/shared/dcevmSharedGC.hpp"
+ 
+ Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
+@@ -459,6 +460,10 @@ public:
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
++  if (log_is_enabled(Info, redefine, class, timer)) {
++    _timer_vm_op_doit.start();
++  }
++
+ #if INCLUDE_CDS
+   if (UseSharedSpaces) {
+     // Sharing is enabled so we remap the shared readonly space to
+@@ -523,8 +528,22 @@ void VM_EnhancedRedefineClasses::doit() {
+     }
+ 
+     Universe::heap()->ensure_parsability(false);
+-    Universe::heap()->object_iterate(&objectClosure);
++    if (UseG1GC) {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    } else {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      Universe::heap()->object_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    }
++
+     Universe::root_oops_do(&oopClosureNoBarrier);
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+@@ -577,12 +596,19 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   if (objectClosure.needs_instance_update()) {
+     // Do a full garbage collection to update the instance sizes accordingly
++
++    if (log_is_enabled(Info, redefine, class, timer)) {
++      _timer_heap_full_gc.start();
++    }
++
+     Universe::set_redefining_gc_run(true);
+     notify_gc_begin(true);
+     // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
+     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
+     notify_gc_end();
+     Universe::set_redefining_gc_run(false);
++
++    _timer_heap_full_gc.stop();
+   }
+ 
+   // Unmark Klass*s as "redefining"
+@@ -630,6 +656,7 @@ void VM_EnhancedRedefineClasses::doit() {
+   }
+ #endif
+ 
++  _timer_vm_op_doit.stop();
+ }
+ 
+ // Cleanup - runs in JVM thread
+@@ -653,16 +680,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   if (log_is_enabled(Info, redefine, class, timer)) {
+     // Used to have separate timers for "doit" and "all", but the timer
+     // overhead skewed the measurements.
+-    jlong doit_time = _timer_rsc_phase1.milliseconds() +
+-                      _timer_rsc_phase2.milliseconds();
+-    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
++    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
+ 
+     log_info(redefine, class, timer)
+       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
+-       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
++       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
+     log_info(redefine, class, timer)
+-      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
+-       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
++      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
++       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
+   }
+ }
+ 
+@@ -1411,7 +1436,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   if (!k->is_instance_klass()) {
+-	return;
++    return;
+   }
+ 
+   HandleMark hm(_thread);
+@@ -1829,10 +1854,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+ 
+   HandleMark hm(THREAD);   // make sure handles from this call are freed
+ 
+-  if (log_is_enabled(Info, redefine, class, timer)) {
+-    _timer_rsc_phase1.start();
+-  }
+-
+   InstanceKlass* new_class = new_class_oop;
+   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
+   assert(the_class != NULL, "must have old version");
+@@ -1887,7 +1908,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+                              new_class->external_name(),
+                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+   }
+-  _timer_rsc_phase2.stop();
+ } // end redefine_single_class()
+ 
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 030852b160a..9755944d70b 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // Performance measurement support. These timers do not cover all
+   // the work done for JVM/TI RedefineClasses() but they do cover
+   // the heavy lifting.
+-  elapsedTimer  _timer_rsc_phase1;
+-  elapsedTimer  _timer_rsc_phase2;
++  elapsedTimer  _timer_vm_op_doit;
+   elapsedTimer  _timer_vm_op_prologue;
++  elapsedTimer  _timer_heap_iterate;
++  elapsedTimer  _timer_heap_full_gc;
+ 
+   // These routines are roughly in call order unless otherwise noted.
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/windows/scripts/mkbundles_x64.sh

@@ -6,5 +6,5 @@ build_number=$3
 script_dir=jb/project/tools/windows/scripts
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "dcevm" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -16,12 +16,19 @@
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_win_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_win_x64}
 
 source jb/project/tools/common.sh
 
@@ -31,7 +38,7 @@ function create_jbr {
   "${bundle_type}_lw")
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx" | "jcef" | "jfx_jcef" | "dcevm")
+  "jfx" | "jcef" | "jfx_jcef" | "dcevm" | "nomod")
     cat modules.list > modules_tmp.list
     ;;
   *)
@@ -45,7 +52,7 @@ function create_jbr {
     --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]
   then
-    rsync -av jcef_win_x64/ ${JBR_BUNDLE}/bin --exclude="modular-sdk" || exit $?
+    cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin
   fi
   echo Modifying release info ...
   cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
@@ -54,6 +61,8 @@ function create_jbr {
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WORK_DIR=$(pwd)
 
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-normal-server-release
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -68,39 +77,44 @@ case "$bundle_type" in
     echo "Adding dcevm patches"
     git am jb/project/tools/patches/dcevm/*.patch
     ;;
+  "nomod")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
+    WITH_IMPORT_MODULES=""
+    ;;
 esac
 
 PATH="/usr/local/bin:/usr/bin:${PATH}"
 ./configure \
   --disable-warnings-as-errors \
-  --disable-debug-symbols \
+  $WITH_DEBUG_LEVEL \
   --with-target-bits=64 \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
-  --with-import-modules=${WORK_DIR}/modular-sdk \
+  $WITH_IMPORT_MODULES \
   --with-toolchain-version=2015 \
   --with-boot-jdk=${BOOT_JDK} \
   --disable-ccache \
   --enable-cds=yes || exit 1
 
 if [ "$bundle_type" == "jfx_jcef" ]; then
-  make LOG=info clean images CONF=windows-x86_64-normal-server-release test-image || exit 1
+  make LOG=info clean images CONF=$RELEASE_NAME test-image || exit 1
 else
-  make LOG=info clean images CONF=windows-x86_64-normal-server-release || exit 1
+  make LOG=info clean images CONF=$RELEASE_NAME || exit 1
 fi
 
-JSDK=build/windows-x86_64-normal-server-release/images/jdk
+JSDK=build/$RELEASE_NAME/images/jdk
 if [[ "$bundle_type" == *jcef* ]]; then
   JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
 fi
-BASE_DIR=build/windows-x86_64-normal-server-release/images
+BASE_DIR=build/$RELEASE_NAME/images
 JBRSDK_BUNDLE=jbrsdk
 
 rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
-rsync -av jcef_win_x64/ ${JBRSDK_BUNDLE}/bin --exclude='modular-sdk' || _exit $?
+cp -R ${JCEF_PATH}/* ${JBRSDK_BUNDLE}/bin
 sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
 mv release ${JBRSDK_BUNDLE}/release
 

jb/project/tools/windows/scripts/mkimages_x64_fd.sh

@@ -0,0 +1,76 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_win_x64
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_win_x64}
+
+source jb/project/tools/common.sh
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WORK_DIR=$(pwd)
+WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+RELEASE_NAME=windows-x86_64-normal-server-fastdebug
+PATH="/usr/local/bin:/usr/bin:${PATH}"
+./configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-target-bits=64 \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --with-toolchain-version=2015 \
+  --with-boot-jdk=${BOOT_JDK} \
+  --disable-ccache \
+  --enable-cds=yes || exit 1
+
+make LOG=info clean images CONF=$RELEASE_NAME || exit 1
+
+JSDK=build/$RELEASE_NAME/images/jdk
+JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
+BASE_DIR=build/$RELEASE_NAME/images
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
+cp -R ${JCEF_PATH}/* ${JBRSDK_BUNDLE}/bin
+sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
+mv release ${JBRSDK_BUNDLE}/release
+
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf ${JBR_BUNDLE}
+
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
+cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin
+echo Modifying release info ...
+cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release

jb/project/tools/windows/scripts/pack_x64.sh

@@ -28,7 +28,7 @@ function pack_jbr {
   "${bundle_type}_lw")
     JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     ;;
-  "jfx" | "jcef" | "dcevm")
+  "jfx" | "jcef" | "dcevm" | "nomod")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     ;;
   "jfx_jcef")
@@ -42,17 +42,18 @@ function pack_jbr {
   JBR=$JBR_BASE_NAME-windows-x64-b$build_number
   echo Creating $JBR.tar.gz ...
   rm -rf ${BASE_DIR}/jbr
-  chmod -R ug+rwx,o+rx ${BASE_DIR}/${JBR_BUNDLE}
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
 
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
   #rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
+RELEASE_NAME=windows-x86_64-normal-server-release
+
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
 
-IMAGES_DIR=build/windows-x86_64-normal-server-release/images
+IMAGES_DIR=build/$RELEASE_NAME/images
 JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
 BASE_DIR=.

jb/project/tools/windows/scripts/pack_x64_fd.sh

@@ -0,0 +1,44 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+RELEASE_NAME=windows-x86_64-normal-server-fastdebug
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JBSDK=$JBRSDK_BASE_NAME-windows-x64-fastdebug-b$build_number
+BASE_DIR=.
+
+JBRSDK_BUNDLE=jbrsdk
+echo Creating $JBSDK.tar.gz ...
+/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+JBR=$JBR_BASE_NAME-windows-x64-fastdebug-b$build_number
+echo Creating $JBR.tar.gz ...
+cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+
+/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1

make/CompileJavaModules.gmk

@@ -321,7 +321,7 @@ jdk.jshell_COPY += .jsh .properties
 
 ################################################################################
 
-jdk.internal.le_COPY += .properties .caps .txt
+jdk.internal.le_COPY += .properties
 
 ################################################################################
 

make/CompileToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -39,6 +39,7 @@ $(eval $(call IncludeCustomExtension, CompileTools.gmk))
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
     $(TOPDIR)/make/jdk/src/classes \
+    $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes \
     #
 
@@ -55,7 +56,6 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
     ADD_JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
-        --add-exports java.base/sun.security.util=ALL-UNNAMED \
         , \
 ))
 

make/CopyInterimCLDRConverter.gmk

@@ -0,0 +1,52 @@
+#
+# 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.  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.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+##########################################################################################
+
+### CLDRConverter needs the JRE time zone names from the java.base source.
+
+define cldrconverter_copytznames
+	$(MKDIR) -p '$(@D)'
+	$(RM) '$@'
+	$(SED) -e "s/package sun.util.resources/package build.tools.cldrconverter/" \
+        -e "s/extends TimeZoneNamesBundle//" \
+        -e "s/protected final/static final/" \
+        < $(<) > $@
+endef
+
+$(eval $(call SetupCopyFiles,COPY_INTERIM_CLDRCONVERTER, \
+    SRC := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes/build/tools/cldrconverter, \
+    FILES := TimeZoneNames.java, \
+    MACRO := cldrconverter_copytznames))
+    
+##########################################################################################
+
+all: $(COPY_INTERIM_CLDRCONVERTER)

make/Main.gmk

@@ -1,4 +1,4 @@
-
+#
 # Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -78,9 +78,13 @@ ifneq ($(CREATING_BUILDJDK), true)
   interim-rmic:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
-  interim-tzdb:
+  interim-cldrconverter:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+
+interim-tzdb:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
 
+
   buildtools-jdk:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
 
@@ -92,7 +96,7 @@ ifneq ($(CREATING_BUILDJDK), true)
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
-    interim-rmic interim-tzdb buildtools-jdk buildtools-modules \
+    interim-rmic interim-cldrconverter interim-tzdb buildtools-jdk buildtools-modules \
     buildtools-hotspot
 
 ################################################################################
@@ -229,7 +233,7 @@ $(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
     TARGET_SUFFIX := static-libs, \
     FILE_PREFIX := Lib, \
     MAKE_SUBDIR := lib, \
-    CHECK_MODULES := $(ALL_MODULES), \
+    CHECK_MODULES := $(STATIC_LIBS_MODULES), \
     USE_WRAPPER := true, \
     EXTRA_ARGS := STATIC_LIBS=true, \
 ))
@@ -685,7 +689,7 @@ else
 
   interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
 
-  buildtools-jdk: interim-langtools interim-tzdb
+  buildtools-jdk: interim-langtools interim-cldrconverter interim-tzdb
 
   buildtools-hotspot: interim-langtools
 
@@ -717,14 +721,10 @@ else
 
   # If not already set, set the JVM variant target so that the JVM will be built.
   JVM_MAIN_LIB_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-libs
-  JVM_MAIN_GENSRC_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc
 
   # Building one JVM variant is enough to start building the other libs
   $(LIBS_TARGETS): $(JVM_MAIN_LIB_TARGETS)
 
-  # Static libs depend on hotspot gensrc
-  $(STATIC_LIBS_TARGETS): $(JVM_MAIN_GENSRC_TARGETS)
-
   $(LAUNCHER_TARGETS): java.base-libs
 
   ifeq ($(STATIC_BUILD), true)

make/RunTests.gmk

@@ -658,14 +658,10 @@ define SetupRunJtregTestBody
     $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
   endif
 
-  # Make sure the tmp dir is normalized as some tests will react badly otherwise
-  $1_TEST_TMP_DIR := $$(abspath $$($1_TEST_SUPPORT_DIR)/tmp)
-
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
       -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
-      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
-      -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
+      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
 
   $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
@@ -744,8 +740,7 @@ define SetupRunJtregTestBody
   run-test-$1: clean-workdir-$1 $$($1_AOT_TARGETS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
-	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
-	    $$($1_TEST_TMP_DIR))
+	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -237,8 +237,7 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
-          | $(GREP) = | $(SED) 's/\\r//g' \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif

make/StaticLibsImage.gmk

@@ -32,13 +32,11 @@ include $(SPEC)
 include MakeBase.gmk
 include Modules.gmk
 
-ALL_MODULES = $(call FindAllModules)
-
 ################################################################################
 
 TARGETS :=
 
-$(foreach m, $(ALL_MODULES), \
+$(foreach m, $(STATIC_LIBS_MODULES), \
   $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$m, \
       FLATTEN := true, \
       SRC := $(SUPPORT_OUTPUTDIR)/native/$m, \

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -74,7 +74,6 @@ TOOL_TZDB = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.tzdb.TzdbZoneRulesCompiler
 
 TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    --add-exports java.base/sun.security.util=ALL-UNNAMED \
     build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
 
 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \

make/autoconf/basics.m4

@@ -641,18 +641,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_MSG_RESULT([$TOPDIR])
   AC_SUBST(TOPDIR)
 
-  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
-  BASIC_FIXUP_PATH(CURDIR)
-  BASIC_FIXUP_PATH(TOPDIR)
-
   if test "x$CUSTOM_ROOT" != x; then
-    BASIC_FIXUP_PATH(CUSTOM_ROOT)
     WORKSPACE_ROOT="${CUSTOM_ROOT}"
   else
     WORKSPACE_ROOT="${TOPDIR}"
   fi
   AC_SUBST(WORKSPACE_ROOT)
 
+  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
+  BASIC_FIXUP_PATH(CURDIR)
+  BASIC_FIXUP_PATH(TOPDIR)
+
   # Locate the directory of this script.
   AUTOCONF_DIR=$TOPDIR/make/autoconf
 

make/autoconf/flags-cflags.m4

@@ -169,7 +169,19 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
     gcc)
       DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
+      # Repeate the check for the BUILD_CC and BUILD_CXX. Need to also reset
+      # CFLAGS since any target specific flags will likely not work with the
+      # build compiler
+      CC_OLD="$CC"
+      CXX_OLD="$CXX"
+      CC="$BUILD_CC"
+      CXX="$BUILD_CXX"
+      CFLAGS_OLD="$CFLAGS"
+      CFLAGS=""
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
+      CC="$CC_OLD"
+      CXX="$CXX_OLD"
+      CFLAGS="$CFLAGS_OLD"
       ;;
     clang)
       DISABLE_WARNING_PREFIX="-Wno-"
@@ -364,17 +376,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
 
   FLAGS_SETUP_CFLAGS_CPU_DEP([TARGET])
 
-  # Repeat the check for the BUILD_CC and BUILD_CXX. Need to also reset CFLAGS
-  # since any target specific flags will likely not work with the build compiler.
-  CC_OLD="$CC"
-  CXX_OLD="$CXX"
-  CFLAGS_OLD="$CFLAGS"
-  CXXFLAGS_OLD="$CXXFLAGS"
-  CC="$BUILD_CC"
-  CXX="$BUILD_CXX"
-  CFLAGS=""
-  CXXFLAGS=""
-
   FLAGS_OS=$OPENJDK_BUILD_OS
   FLAGS_OS_TYPE=$OPENJDK_BUILD_OS_TYPE
   FLAGS_CPU=$OPENJDK_BUILD_CPU
@@ -386,11 +387,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
 
   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
 
-  CC="$CC_OLD"
-  CXX="$CXX_OLD"
-  CFLAGS="$CFLAGS_OLD"
-  CXXFLAGS="$CXXFLAGS_OLD"
-
   # Tests are only ever compiled for TARGET
   CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
   CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"

make/autoconf/hotspot.m4

@@ -25,7 +25,7 @@
 
 # All valid JVM features, regardless of platform
 VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
-    graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \
+    graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc zgc nmt cds \
     static-build link-time-opt aot jfr"
 
 # Deprecated JVM features (these are ignored, but with a warning)
@@ -352,19 +352,6 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   fi
 
-  # Only enable Shenandoah on supported arches, and only if requested
-  AC_MSG_CHECKING([if shenandoah can be built])
-  if HOTSPOT_CHECK_JVM_FEATURE(shenandoahgc); then
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
-      AC_MSG_RESULT([yes])
-    else
-      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
-      AC_MSG_RESULT([no, platform not supported])
-    fi
-  else
-      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
-  fi
-
   # Only enable ZGC on supported platforms
   AC_MSG_CHECKING([if zgc can be built])
   if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
@@ -376,7 +363,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 
   # Disable unsupported GCs for Zero
   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc shenandoahgc zgc"
+    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc"
   fi
 
   # Turn on additional features based on other parts of configure
@@ -507,7 +494,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   fi
 
   # All variants but minimal (and custom) get these features
-  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc shenandoahgc jni-check jvmti management nmt services vm-structs zgc"
+  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs zgc"
 
   AC_MSG_CHECKING([if cds should be enabled])
   if test "x$ENABLE_CDS" = "xtrue"; then

make/autoconf/lib-ffi.m4

@@ -85,20 +85,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           [LIBFFI_FOUND=no]
       )
     fi
-    # on macos we need a special case for system's libffi as
-    # headers are located only in sdk in $SYSROOT and in ffi subfolder
-    if test "x$LIBFFI_FOUND" = xno; then
-      if test "x$SYSROOT" != "x"; then
-        AC_CHECK_HEADER([$SYSROOT/usr/include/ffi/ffi.h],
-            [
-              LIBFFI_FOUND=yes
-              LIBFFI_CFLAGS="-I${SYSROOT}/usr/include/ffi"
-              LIBFFI_LIBS=-lffi
-            ],
-            [LIBFFI_FOUND=no]
-        )
-      fi
-    fi
     if test "x$LIBFFI_FOUND" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([ffi])
       AC_MSG_ERROR([Could not find libffi! $HELP_MSG])

make/autoconf/version-numbers

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=9
-DEFAULT_VERSION_PATCH=1
+DEFAULT_VERSION_UPDATE=8
+DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2020-11-04
+DEFAULT_VERSION_DATE=2020-07-14
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/Modules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -63,7 +63,6 @@ BOOT_MODULES += \
     jdk.management \
     jdk.management.jfr \
     jdk.management.agent \
-    jdk.naming.ldap \
     jdk.net \
     jdk.sctp \
     jdk.unsupported \
@@ -166,7 +165,6 @@ DOCS_MODULES += \
     jdk.management.agent \
     jdk.management.jfr \
     jdk.naming.dns \
-    jdk.naming.ldap \
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
@@ -199,6 +197,21 @@ HOTSPOT_MODULES := \
     jdk.internal.vm.compiler.management \
     #
 
+# The native dynamic libraries in these modules will also get built into static
+# libraries for consumption by downstream projects that need to statically link
+# the JDK libraries. Those static libraries are not part of the main JDK
+# distribution. 
+STATIC_LIBS_MODULES := \
+    java.base \
+    jdk.crypto.ec \
+    jdk.security.auth \
+    java.prefs \
+    java.security.jgss \
+    java.smartcardio \
+    jdk.crypto.cryptoki \
+    jdk.net \
+    #
+
 ################################################################################
 # Some platforms don't have the serviceability agent
 

make/common/TextFileProcessing.gmk

@@ -155,10 +155,9 @@ define SetupTextFileProcessingBody
     # Convert the REPLACEMENTS syntax ( A => B ; C => D ; ...) to a sed command
     # line (-e "s/A/B/g" -e "s/C/D/g" ...), basically by replacing '=>' with '/'
     # and ';' with '/g" -e "s/', and adjusting for edge cases.
-    # '&' has special meaning in sed so needs to be escaped.
     $1_REPLACEMENTS_COMMAND_LINE := $(SED) -e 's$$($1_SEP)$$(subst $$(SPACE);$$(SPACE),$$($1_SEP)g' \
         -e 's$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE),$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE);$$(SPACE),$$($1_SEP)$$($1_SEP)g' \
-        -e 's$$($1_SEP),$$(subst &,\&,$$(strip $$($1_REPLACEMENTS))))))$$($1_SEP)g'
+        -e 's$$($1_SEP),$$(strip $$($1_REPLACEMENTS)))))$$($1_SEP)g'
   else
     # We don't have any replacements, just pipe the file through cat.
     $1_REPLACEMENTS_COMMAND_LINE := $(CAT)

make/data/blacklistedcertsconverter/blacklisted.certs.pem

@@ -1,7 +1,8 @@
 #! java BlacklistedCertsConverter SHA-256
 
-# The line above must be the first line of this file. Do not
-# remove it.
+# The line above must be the first line of the blacklisted.certs.pem
+# file inside src/share/lib/security/. It will be ignored if added in
+# src/closed/share/lib/security/blacklisted.certs.pem.
 
 // Subject: CN=Digisign Server ID (Enrich),
 //          OU=457608-K,

make/data/bundle/JDK-Info.plist

@@ -22,8 +22,6 @@
         <string>????</string>
         <key>CFBundleVersion</key>
         <string>@@VERSION@@</string>
-        <key>NSMicrophoneUsageDescription</key>
-        <string>The application is requesting access to the microphone.</string>
         <key>JavaVM</key>
         <dict>
                 <key>JVMCapabilities</key>

make/data/bundle/JRE-Info.plist

@@ -22,8 +22,6 @@
         <string>????</string>
         <key>CFBundleVersion</key>
         <string>@@VERSION@@</string>
-        <key>NSMicrophoneUsageDescription</key>
-        <string>The application is requesting access to the microphone.</string>
         <key>JavaVM</key>
         <dict>
                 <key>JVMMinimumFrameworkVersion</key>

make/data/cacerts/entrustrootcag4

@@ -1,43 +0,0 @@
-Owner: CN=Entrust Root Certification Authority - G4, OU="(c) 2015 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-Issuer: CN=Entrust Root Certification Authority - G4, OU="(c) 2015 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-Serial number: d9b5437fafa9390f000000005565ad58
-Valid from: Wed May 27 11:11:16 GMT 2015 until: Sun Dec 27 11:41:16 GMT 2037
-Signature algorithm name: SHA256withRSA
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
-gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
-Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
-MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
-BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
-MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
-c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
-bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
-2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
-T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
-5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
-C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
-DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
-wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
-2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
-nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
-dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
-N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
-c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
-5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
-Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
-hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
-B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
-AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
-H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
-b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
-2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
-IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
-5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
-n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
------END CERTIFICATE-----

make/data/cacerts/sslrooteccca

@@ -1,23 +0,0 @@
-Owner: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Issuer: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Serial number: 75e6dfcbc1685ba8
-Valid from: Fri Feb 12 18:14:03 GMT 2016 until: Tue Feb 12 18:14:03 GMT 2041
-Signature algorithm name: SHA256withECDSA
-Subject Public Key Algorithm: 384-bit EC key
-Version: 3
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T
-U0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNDAzWhcNNDEwMjEyMTgxNDAz
-WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0
-b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBS
-b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI
-7Z4INcgn64mMU1jrYor+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPg
-CemB+vNH06NjMGEwHQYDVR0OBBYEFILRhXMw5zUE044CkvvlpNHEIejNMA8GA1Ud
-EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTTjgKS++Wk0cQh6M0wDgYD
-VR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCWe+0F+S8T
-kdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+
-gA0z5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----

make/data/cacerts/sslrootevrsaca

@@ -1,41 +0,0 @@
-Owner: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Issuer: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Serial number: 56b629cd34bc78f6
-Valid from: Wed May 31 18:14:37 GMT 2017 until: Fri May 30 18:14:37 GMT 2042
-Signature algorithm name: SHA256withRSA
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UE
-CgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMB4XDTE3MDUzMTE4MTQzN1oXDTQy
-MDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4G
-A1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQD
-DC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvq
-M0fNTPl9fb69LT3w23jhhqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssuf
-OePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7wcXHswxzpY6IXFJ3vG2fThVUCAtZJycxa
-4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTOZw+oz12WGQvE43LrrdF9
-HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+B6KjBSYR
-aZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcA
-b9ZhCBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQ
-Gp8hLH94t2S42Oim9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQV
-PWKchjgGAGYS5Fl2WlPAApiiECtoRHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMO
-pgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+SlmJuwgUHfbSguPvuUCYHBBXtSu
-UDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48+qvWBkofZ6aY
-MBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa4
-9QaAJadz20ZpqJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBW
-s47LCp1Jjr+kxJG7ZhcFUZh1++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5
-Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nxY/hoLVUE0fKNsKTPvDxeH3jnpaAg
-cLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2GguDKBAdRUNf/ktUM
-79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDzOFSz
-/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXt
-ll9ldDz7CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEm
-Kf7GUmG6sXP/wwyc5WxqlD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKK
-QbNmC1r7fSOl8hqw/96bg5Qu0T/fkreRrwU7ZcegbLHNYhLDkBvjJc40vG93drEQ
-w/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1hlMYegouCRw2n5H9gooi
-S9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX9hwJ1C07
-mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----

make/data/cacerts/sslrootrsaca

@@ -1,41 +0,0 @@
-Owner: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Issuer: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-Serial number: 7b2c9bd316803299
-Valid from: Fri Feb 12 17:39:39 GMT 2016 until: Tue Feb 12 17:39:39 GMT 2041
-Signature algorithm name: SHA256withRSA
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE
-BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK
-DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTczOTM5WhcNNDEwMjEyMTcz
-OTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv
-dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2R
-xFdHaxh3a3by/ZPkPQ/CFp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aX
-qhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcC
-C52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/geoeOy3ZExqysdBP+lSgQ3
-6YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkpk8zruFvh
-/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrF
-YD3ZfBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93E
-JNyAKoFBbZQ+yODJgUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVc
-US4cK38acijnALXRdMbX5J+tB5O2UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8
-ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi81xtZPCvM8hnIk2snYxnP/Okm
-+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4sbE6x/c+cCbqi
-M+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4G
-A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGV
-cpNxJK1ok1iOMq8bs3AD/CUrdIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBc
-Hadm47GUBwwyOabqG7B52B2ccETjit3E+ZUfijhDPwGFpUenPUayvOUiaPd7nNgs
-PgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAslu1OJD7OAUN5F7kR/
-q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjqerQ0
-cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jr
-a6x+3uxjMxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90I
-H37hVZkLId6Tngr75qNJvTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/Y
-K9f1JmzJBjSWFupwWRoyeXkLtoh/D1JIPb9s2KJELtFOt3JY04kTlf5Eq/jXixtu
-nLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406ywKBjYZC6VWg3dGq2ktuf
-oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY
-Ic2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----

make/data/charsetmapping/MS950.map

@@ -23,10 +23,10 @@
 #    0xF9FD -> u256F -> 0xA2A3 
 #    0xA2CC -> u5341 -> 0xA451 
 #    0xA2CE -> u5345 -> 0xA4CA  
-#    0xA2A4 -> u2550 -> 0xF9F9
-#    0xA2A5 -> u255E -> 0xF9E9
-#    0xA2A6 -> u256A -> 0xF9EA
-#    0xA2A7 -> u2561 -> 0xF9EB
+#    0xF9F9 -> u2550 -> 0xA2A4
+#    0xF9E9 -> u255E -> 0xA2A5	
+#    0xF9EA -> u256A -> 0xA2A6	
+#    0xF9EB -> u2561 -> 0xA2A7
 #
 # Column #1 is the cp950 code (in hex)
 # Column #2 is the Unicode (in hex as 0xXXXX)

make/data/charsetmapping/MS950.nr

@@ -6,13 +6,13 @@
 # (we don't need a MS950.c2b, the entries of MS950.c2b-irreversible
 #  are added in MS950.b2c already)
 #
-0xA2A4  0x2550
-0xA2A5  0x255E
-0xA2A6  0x256A
-0xA2A7  0x2561
-0xA2CC  0x5341
-0xA2CE  0x5345
-0xF9FA  0x256D
+0xF9FA  0x256D 
 0xF9FB  0x256E
 0xF9FC  0x2570
 0xF9FD  0x256F
+0xA2CC  0x5341
+0xA2CE  0x5345
+0xF9F9  0x2550
+0xF9E9  0x255E
+0xF9EA  0x256A
+0xF9EB  0x2561

make/data/publicsuffixlist/VERSION

@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
-Date: 2020-04-24
+Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
+Date: 2019-09-28

make/data/publicsuffixlist/public_suffix_list.dat

@@ -79,6 +79,7 @@ exchange.aero
 express.aero
 federation.aero
 flight.aero
+freight.aero
 fuel.aero
 gliding.aero
 government.aero
@@ -212,7 +213,6 @@ ac.at
 co.at
 gv.at
 or.at
-sth.ac.at
 
 // au : https://en.wikipedia.org/wiki/.au
 // http://www.auda.org.au/
@@ -241,7 +241,7 @@ wa.au
 // 3LDs
 act.edu.au
 catholic.edu.au
-// eq.edu.au - Removed at the request of the Queensland Department of Education
+eq.edu.au
 nsw.edu.au
 nt.edu.au
 qld.edu.au
@@ -719,13 +719,11 @@ gouv.ci
 *.ck
 !www.ck
 
-// cl : https://www.nic.cl
-// Confirmed by .CL registry <hsalgado@nic.cl>
+// cl : https://en.wikipedia.org/wiki/.cl
 cl
-aprendemas.cl
-co.cl
-gob.cl
 gov.cl
+gob.cl
+co.cl
 mil.cl
 
 // cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
@@ -984,19 +982,8 @@ fi
 // TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
-// fj : http://domains.fj/
-// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
-fj
-ac.fj
-biz.fj
-com.fj
-gov.fj
-info.fj
-mil.fj
-name.fj
-net.fj
-org.fj
-pro.fj
+// fj : https://en.wikipedia.org/wiki/.fj
+*.fj
 
 // fk : https://en.wikipedia.org/wiki/.fk
 *.fk
@@ -1381,7 +1368,7 @@ it
 gov.it
 edu.it
 // Reserved geo-names (regions and provinces):
-// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
+// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf
 // Regions
 abr.it
 abruzzo.it
@@ -5899,9 +5886,14 @@ gov.rs
 in.rs
 org.rs
 
-// ru : https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
-// Submitted by George Georgievsky <gug@cctld.ru>
+// ru : https://cctld.ru/en/domains/domens_ru/reserved/
 ru
+ac.ru
+edu.ru
+gov.ru
+int.ru
+mil.ru
+test.ru
 
 // rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
 rw
@@ -6046,12 +6038,9 @@ org.sn
 perso.sn
 univ.sn
 
-// so : http://sonic.so/policies/
+// so : http://www.soregistry.com/
 so
 com.so
-edu.so
-gov.so
-me.so
 net.so
 org.so
 
@@ -6521,7 +6510,7 @@ k12.ok.us
 k12.or.us
 k12.pa.us
 k12.pr.us
-// k12.ri.us  Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
+k12.ri.us
 k12.sc.us
 // k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
@@ -6808,13 +6797,8 @@ yt
 مصر
 
 // xn--e1a4c ("eu", Cyrillic) : EU
-// https://eurid.eu
 ею
 
-// xn--qxa6a ("eu", Greek) : EU
-// https://eurid.eu
-ευ
-
 // xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR
 موريتانيا
 
@@ -6971,8 +6955,7 @@ yt
 ак.срб
 
 // xn--p1ai ("rf", Russian-Cyrillic) : RU
-// https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
-// Submitted by George Georgievsky <gug@cctld.ru>
+// http://www.cctld.ru/en/docs/rulesrf.php
 рф
 
 // xn--wgbl6a ("Qatar", Arabic) : QA
@@ -7092,7 +7075,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-09-26T16:43:02Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7214,9 +7197,6 @@ alsace
 // alstom : 2015-07-30 ALSTOM
 alstom
 
-// amazon : 2019-12-19 Amazon Registry Services, Inc.
-amazon
-
 // americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
 americanexpress
 
@@ -7316,7 +7296,7 @@ auto
 // autos : 2014-01-09 DERAutos, LLC
 autos
 
-// avianca : 2015-01-08 Avianca Holdings S.A.
+// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
 avianca
 
 // aws : 2015-06-25 Amazon Registry Services, Inc.
@@ -7394,7 +7374,7 @@ bcn
 // beats : 2015-05-14 Beats Electronics, LLC
 beats
 
-// beauty : 2015-12-03 XYZ.COM LLC
+// beauty : 2015-12-03 L'Oréal
 beauty
 
 // beer : 2014-01-09 Minds + Machines Group Limited
@@ -7607,6 +7587,9 @@ careers
 // cars : 2014-11-13 Cars Registry Limited
 cars
 
+// cartier : 2014-06-23 Richemont DNS Inc.
+cartier
+
 // casa : 2013-11-21 Minds + Machines Group Limited
 casa
 
@@ -7685,6 +7668,9 @@ christmas
 // chrome : 2014-07-24 Charleston Road Registry Inc.
 chrome
 
+// chrysler : 2015-07-30 FCA US LLC.
+chrysler
+
 // church : 2014-02-06 Binky Moon, LLC
 church
 
@@ -7850,7 +7836,7 @@ cuisinella
 // cymru : 2014-05-08 Nominet UK
 cymru
 
-// cyou : 2015-01-22 ShortDot SA
+// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
 cyou
 
 // dabur : 2014-02-06 Dabur India Limited
@@ -7964,6 +7950,9 @@ docs
 // doctor : 2016-06-02 Binky Moon, LLC
 doctor
 
+// dodge : 2015-07-30 FCA US LLC.
+dodge
+
 // dog : 2014-12-04 Binky Moon, LLC
 dog
 
@@ -8069,6 +8058,9 @@ eus
 // events : 2013-12-05 Binky Moon, LLC
 events
 
+// everbank : 2014-05-15 EverBank
+everbank
+
 // exchange : 2014-03-06 Binky Moon, LLC
 exchange
 
@@ -8342,7 +8334,7 @@ gmail
 // gmbh : 2016-01-29 Binky Moon, LLC
 gmbh
 
-// gmo : 2014-01-09 GMO Internet, Inc.
+// gmo : 2014-01-09 GMO Internet Pte. Ltd.
 gmo
 
 // gmx : 2014-04-24 1&1 Mail & Media GmbH
@@ -8417,7 +8409,7 @@ guitars
 // guru : 2013-08-27 Binky Moon, LLC
 guru
 
-// hair : 2015-12-03 XYZ.COM LLC
+// hair : 2015-12-03 L'Oréal
 hair
 
 // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
@@ -8753,6 +8745,9 @@ kyoto
 // lacaixa : 2014-01-09 Fundación Bancaria Caixa d’Estalvis i Pensions de Barcelona, “la Caixa”
 lacaixa
 
+// ladbrokes : 2015-08-06 LADBROKES INTERNATIONAL PLC
+ladbrokes
+
 // lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
 lamborghini
 
@@ -8765,6 +8760,9 @@ lancaster
 // lancia : 2015-07-31 Fiat Chrysler Automobiles N.V.
 lancia
 
+// lancome : 2015-07-23 L'Oréal
+lancome
+
 // land : 2013-09-10 Binky Moon, LLC
 land
 
@@ -8816,6 +8814,9 @@ lexus
 // lgbt : 2014-05-08 Afilias Limited
 lgbt
 
+// liaison : 2014-10-02 Liaison Technologies, Incorporated
+liaison
+
 // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
 lidl
 
@@ -8936,7 +8937,7 @@ maif
 // maison : 2013-12-05 Binky Moon, LLC
 maison
 
-// makeup : 2015-01-15 XYZ.COM LLC
+// makeup : 2015-01-15 L'Oréal
 makeup
 
 // man : 2014-12-04 MAN SE
@@ -9059,6 +9060,9 @@ money
 // monster : 2015-09-11 XYZ.COM LLC
 monster
 
+// mopar : 2015-07-30 FCA US LLC.
+mopar
+
 // mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant")
 mormon
 
@@ -9080,6 +9084,9 @@ mov
 // movie : 2015-02-05 Binky Moon, LLC
 movie
 
+// movistar : 2014-10-16 Telefónica S.A.
+movistar
+
 // msd : 2015-07-23 MSD Registry Holdings, Inc.
 msd
 
@@ -9095,6 +9102,9 @@ mutual
 // nab : 2015-08-20 National Australia Bank Limited
 nab
 
+// nadex : 2014-12-11 Nadex Domains, Inc.
+nadex
+
 // nagoya : 2013-10-24 GMO Registry, Inc.
 nagoya
 
@@ -9335,6 +9345,9 @@ photos
 // physio : 2014-05-01 PhysBiz Pty Ltd
 physio
 
+// piaget : 2014-10-16 Richemont DNS Inc.
+piaget
+
 // pics : 2013-11-14 Uniregistry, Corp.
 pics
 
@@ -9446,7 +9459,7 @@ qpon
 // quebec : 2013-12-19 PointQuébec Inc
 quebec
 
-// quest : 2015-03-26 XYZ.COM LLC
+// quest : 2015-03-26 Quest ION Limited
 quest
 
 // qvc : 2015-07-30 QVC, Inc.
@@ -9776,7 +9789,7 @@ site
 // ski : 2015-04-09 Afilias Limited
 ski
 
-// skin : 2015-01-15 XYZ.COM LLC
+// skin : 2015-01-15 L'Oréal
 skin
 
 // sky : 2014-06-19 Sky International AG
@@ -9845,6 +9858,9 @@ spreadbetting
 // srl : 2015-05-07 InterNetX, Corp
 srl
 
+// srt : 2015-07-30 FCA US LLC.
+srt
+
 // stada : 2014-11-13 STADA Arzneimittel AG
 stada
 
@@ -9971,6 +9987,9 @@ tech
 // technology : 2013-09-13 Binky Moon, LLC
 technology
 
+// telefonica : 2014-10-16 Telefónica S.A.
+telefonica
+
 // temasek : 2014-08-07 Temasek Holdings (Private) Limited
 temasek
 
@@ -10064,7 +10083,7 @@ trading
 // training : 2013-11-07 Binky Moon, LLC
 training
 
-// travel : 2015-10-09 Dog Beach, LLC
+// travel :  Dog Beach, LLC
 travel
 
 // travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
@@ -10103,6 +10122,9 @@ ubank
 // ubs : 2014-12-11 UBS AG
 ubs
 
+// uconnect : 2015-07-30 FCA US LLC.
+uconnect
+
 // unicom : 2015-10-15 China United Network Communications Corporation Limited
 unicom
 
@@ -10172,6 +10194,9 @@ visa
 // vision : 2013-12-05 Binky Moon, LLC
 vision
 
+// vistaprint : 2014-09-18 Vistaprint Limited
+vistaprint
+
 // viva : 2014-11-07 Saudi Telecom Company
 viva
 
@@ -10220,6 +10245,9 @@ wang
 // wanggou : 2014-12-18 Amazon Registry Services, Inc.
 wanggou
 
+// warman : 2015-06-18 Weir Group IP Limited
+warman
+
 // watch : 2013-11-14 Binky Moon, LLC
 watch
 
@@ -10334,7 +10362,7 @@ xin
 // xn--3bst00m : 2013-09-13 Eagle Horizon Limited
 集团
 
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED
 在线
 
 // xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd.
@@ -10349,7 +10377,7 @@ xin
 // xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
 八卦
 
-// xn--4gbrim : 2013-10-04 Fans TLD Limited
+// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment
 موقع
 
 // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
@@ -10409,13 +10437,10 @@ xin
 // xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
 ストア
 
-// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc.
-アマゾン
-
 // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
 삼성
 
-// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited
+// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited
 商标
 
 // xn--czrs0t : 2013-12-19 Binky Moon, LLC
@@ -10433,13 +10458,16 @@ xin
 // xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd.
 新闻
 
+// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited
+工行
+
 // xn--fct429k : 2015-04-09 Amazon Registry Services, Inc.
 家電
 
 // xn--fhbei : 2015-01-15 VeriSign Sarl
 كوم
 
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED
 中文网
 
 // xn--fiq64b : 2013-10-14 CITIC Group Corporation
@@ -10469,7 +10497,7 @@ xin
 // xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
 संगठन
 
-// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited
+// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited
 餐厅
 
 // xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC)
@@ -10478,9 +10506,6 @@ xin
 // xn--j1aef : 2015-01-15 VeriSign Sarl
 ком
 
-// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc.
-亚马逊
-
 // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
 诺基亚
 
@@ -10541,7 +10566,7 @@ xin
 // xn--nyqy26a : 2014-11-07 Stable Tone Limited
 健康
 
-// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
+// xn--otu796d : 2017-08-06 Dot Trademark TLD Holding Company Limited
 招聘
 
 // xn--p1acf : 2013-12-12 Rusnames Limited
@@ -10616,7 +10641,7 @@ yahoo
 // yamaxun : 2014-12-18 Amazon Registry Services, Inc.
 yamaxun
 
-// yandex : 2014-04-10 Yandex Europe B.V.
+// yandex : 2014-04-10 YANDEX, LLC
 yandex
 
 // yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
@@ -10666,12 +10691,6 @@ cc.ua
 inf.ua
 ltd.ua
 
-// Adobe : https://www.adobe.com/
-// Submitted by Ian Boston <boston@adobe.com>
-adobeaemcloud.com
-adobeaemcloud.net
-*.dev.adobeaemcloud.com
-
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
@@ -10789,10 +10808,6 @@ s3-website.eu-west-2.amazonaws.com
 s3-website.eu-west-3.amazonaws.com
 s3-website.us-east-2.amazonaws.com
 
-// Amsterdam Wireless: https://www.amsterdamwireless.nl/
-// Submitted by Imre Jonk <hostmaster@amsterdamwireless.nl>
-amsw.nl
-
 // Amune : https://amune.org/
 // Submitted by Team Amune <cert@amune.org>
 t3l3p0rt.net
@@ -10827,6 +10842,12 @@ sweetpepper.org
 // Submitted by Vincent Tseng <vincenttseng@asustor.com>
 myasustor.com
 
+// Automattic Inc. : https://automattic.com/
+// Submitted by Alex Concha <alex.concha@automattic.com>
+go-vip.co
+go-vip.net
+wpcomstaging.com
+
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
 myfritz.net
@@ -10963,9 +10984,8 @@ certmgr.org
 xenapponazure.com
 
 // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
+// Submitted by Rishabh Nambiar <rishabh.nambiar@discourse.org>
 discourse.group
-discourse.team
 
 // ClearVox : http://www.clearvox.nl/
 // Submitted by Leon Rowland <leon@clearvox.nl>
@@ -10980,10 +11000,6 @@ cleverapps.io
 *.lcl.dev
 *.stg.dev
 
-// Clic2000 : https://clic2000.fr
-// Submitted by Mathilde Blanchemanche <mathilde@clic2000.fr>
-clic2000.net
-
 // Cloud66 : https://www.cloud66.com/
 // Submitted by Khash Sajadi <khash@cloud66.com>
 c66.me
@@ -11066,15 +11082,6 @@ co.no
 webhosting.be
 hosting-cluster.nl
 
-// Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
-// Submitted by George Georgievsky <gug@cctld.ru>
-ac.ru
-edu.ru
-gov.ru
-int.ru
-mil.ru
-test.ru
-
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
@@ -11099,18 +11106,6 @@ realm.cz
 // Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
 cupcake.is
 
-// Curv UG : https://curv-labs.de/
-// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
-curv.dev
-
-// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
-// Submitted by Gregory Drake <support@dyn.com>
-// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
-*.customer-oci.com
-*.oci.customer-oci.com
-*.ocp.customer-oci.com
-*.ocs.customer-oci.com
-
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
@@ -11138,23 +11133,11 @@ firm.dk
 reg.dk
 store.dk
 
-// dappnode.io : https://dappnode.io/
-// Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
-dyndns.dappnode.io
-
 // dapps.earth : https://dapps.earth/
 // Submitted by Daniil Burdakov <icqkill@gmail.com>
 *.dapps.earth
 *.bzz.dapps.earth
 
-// Dark, Inc. : https://darklang.com
-// Submitted by Paul Biggar <ops@darklang.com>
-builtwithdark.com
-
-// Datawire, Inc : https://www.datawire.io
-// Submitted by Richard Li <secalert@datawire.io>
-edgestack.me
-
 // Debian : https://www.debian.org/
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
@@ -11528,10 +11511,6 @@ dynv6.net
 // Submitted by Vladimir Dudr <info@e4you.cz>
 e4.cz
 
-// En root‽ : https://en-root.org
-// Submitted by Emmanuel Raviart <emmanuel@raviart.com>
-en-root.fr
-
 // Enalean SAS: https://www.enalean.com
 // Submitted by Thomas Cottier <thomas.cottier@enalean.com>
 mytuleap.com
@@ -11624,10 +11603,6 @@ twmail.org
 mymailer.com.tw
 url.tw
 
-// Fabrica Technologies, Inc. : https://www.fabrica.dev/
-// Submitted by Eric Jiang <eric@fabrica.dev>
-onfabrica.com
-
 // Facebook, Inc.
 // Submitted by Peter Ruibal <public-suffix@fb.com>
 apps.fbsbx.com
@@ -11711,7 +11686,6 @@ vologda.su
 // Fancy Bits, LLC : http://getchannels.com
 // Submitted by Aman Gupta <aman@getchannels.com>
 channelsdvr.net
-u.channelsdvr.net
 
 // Fastly Inc. : http://www.fastly.com/
 // Submitted by Fastly Security <security@fastly.com>
@@ -11730,10 +11704,6 @@ global.ssl.fastly.net
 // Submitted by Likhachev Vasiliy <lihachev@fastvps.ru>
 fastpanel.direct
 fastvps-server.com
-myfast.space
-myfast.host
-fastvps.site
-fastvps.host
 
 // Featherhead : https://featherhead.xyz/
 // Submitted by Simon Menke <simon@featherhead.xyz>
@@ -11747,13 +11717,6 @@ cloud.fedoraproject.org
 app.os.fedoraproject.org
 app.os.stg.fedoraproject.org
 
-// FearWorks Media Ltd. : https://fearworksmedia.co.uk
-// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
-conn.uk
-copro.uk
-couk.me
-ukco.me
-
 // Fermax : https://fermax.com/
 // submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
 mydobiss.com
@@ -11774,12 +11737,9 @@ firebaseapp.com
 
 // Flynn : https://flynn.io
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
+flynnhub.com
 flynnhosting.net
 
-// Frederik Braun https://frederik-braun.com
-// Submitted by Frederik Braun <fb@frederik-braun.com>
-0e.vc
-
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
 freebox-os.com
@@ -11813,9 +11773,8 @@ service.gov.uk
 gehirn.ne.jp
 usercontent.jp
 
-// Gentlent, Inc. : https://www.gentlent.com
-// Submitted by Tom Klein <tom@gentlent.com>
-gentapps.com
+// Gentlent, Limited : https://www.gentlent.com
+// Submitted by Tom Klein <tklein@gentlent.com>
 lab.ms
 
 // GitHub, Inc.
@@ -11860,7 +11819,6 @@ a.run.app
 web.app
 *.0emm.com
 appspot.com
-*.r.appspot.com
 blogspot.ae
 blogspot.al
 blogspot.am
@@ -11945,14 +11903,6 @@ publishproxy.com
 withgoogle.com
 withyoutube.com
 
-// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
-// Submitted by Aaron Marais <its_me@aaronleem.co.za>
-graphox.us
-
-// Group 53, LLC : https://www.group53.com
-// Submitted by Tyler Todd <noc@nova53.net>
-awsmppl.com
-
 // Hakaran group: http://hakaran.cz
 // Submited by Arseniy Sokolov <security@hakaran.cz>
 fin.ci
@@ -12002,7 +11952,6 @@ col.ng
 firm.ng
 gen.ng
 ltd.ng
-ngo.ng
 ng.school
 sch.so
 
@@ -12079,9 +12028,8 @@ pixolino.com
 ipifony.net
 
 // IServ GmbH : https://iserv.eu
-// Submitted by Kim-Alexander Brodowski <info@iserv.eu>
+// Submitted by Kim-Alexander Brodowski <kim.brodowski@iserv.eu>
 mein-iserv.de
-schulserver.de
 test-iserv.de
 iserv.dev
 
@@ -12124,10 +12072,6 @@ uni5.net
 // Submitted by Roy Keene <rkeene@knightpoint.com>
 knightpoint.systems
 
-// KUROKU LTD : https://kuroku.ltd/
-// Submitted by DisposaBoy <security@oya.to>
-oya.to
-
 // .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
 co.krd
 edu.krd
@@ -12267,8 +12211,8 @@ eu.meteorapp.com
 co.pl
 
 // Microsoft Corporation : http://microsoft.com
-// Submitted by Mostafa Elzeiny <moelzein@microsoft.com>
-*.azurecontainer.io
+// Submitted by Justin Luk <juluk@microsoft.com>
+azurecontainer.io
 azurewebsites.net
 azure-mobile.net
 cloudapp.net
@@ -12314,7 +12258,6 @@ nctu.me
 // Netlify : https://www.netlify.com
 // Submitted by Jessica Parsons <jessica@netlify.com>
 bitballoon.com
-netlify.app
 netlify.com
 
 // Neustar Inc.
@@ -12472,13 +12415,12 @@ pcloud.host
 nyc.mn
 
 // NymNom : https://nymnom.com/
-// Submitted by NymNom <psl@nymnom.com>
+// Submitted by Dave McCormack <dave.mccormack@nymnom.com>
 nom.ae
 nom.af
 nom.ai
 nom.al
 nym.by
-nom.bz
 nym.bz
 nom.cl
 nym.ec
@@ -12500,7 +12442,6 @@ nom.li
 nym.li
 nym.lt
 nym.lu
-nom.lv
 nym.me
 nom.mk
 nym.mn
@@ -12525,10 +12466,6 @@ nom.uy
 nom.vc
 nom.vg
 
-// Observable, Inc. : https://observablehq.com
-// Submitted by Mike Bostock <dns@observablehq.com>
-static.observableusercontent.com
-
 // Octopodal Solutions, LLC. : https://ulterius.io/
 // Submitted by Andrew Sampson <andrew@ulterius.io>
 cya.gg
@@ -12549,10 +12486,6 @@ opencraft.hosting
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
 
-// Oursky Limited : https://skygear.io/
-// Submited by Skygear Developer <hello@skygear.io>
-skygearapp.com
-
 // OutSystems
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
 outsystemscloud.com
@@ -12595,10 +12528,6 @@ gotpantheon.com
 // Submitted by Steve Leung <steveleung@peplink.com>
 mypep.link
 
-// Perspecta : https://perspecta.com/
-// Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
-perspecta.cloud
-
 // Planet-Work : https://www.planet-work.com/
 // Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
 on-web.fr
@@ -12608,12 +12537,6 @@ on-web.fr
 *.platform.sh
 *.platformsh.site
 
-// Platter: https://platter.dev
-// Submitted by Patrick Flor <patrick@platter.dev>
-platter-app.com
-platter-app.dev
-platterp.us
-
 // Port53 : https://port53.io/
 // Submitted by Maximilian Schieder <maxi@zeug.co>
 dyn53.io
@@ -12655,10 +12578,6 @@ pubtls.org
 // Submitted by Xavier De Cock <xdecock@gmail.com>
 qualifioapp.com
 
-// QuickBackend: https://www.quickbackend.com
-// Submitted by Dani Biro <dani@pymet.com>
-qbuser.com
-
 // Redstar Consultants : https://www.redstarconsultants.com/
 // Submitted by Jons Slemmer <jons@redstarconsultants.com>
 instantcloud.cn
@@ -12671,11 +12590,6 @@ ras.ru
 // Submitted by Daniel Dent (https://www.danieldent.com/)
 qa2.com
 
-// QCX
-// Submitted by Cassandra Beelen <cassandra@beelen.one>
-qcx.io
-*.sys.qcx.io
-
 // QNAP System Inc : https://www.qnap.com
 // Submitted by Nick Chang <nickchang@qnap.com>
 dev-myqnapcloud.com
@@ -12698,7 +12612,6 @@ rackmaze.net
 
 // Rancher Labs, Inc : https://rancher.com
 // Submitted by Vincent Fiduccia <domains@rancher.com>
-*.on-k3s.io
 *.on-rancher.cloud
 *.on-rio.io
 
@@ -12752,10 +12665,6 @@ logoip.com
 // Submitted by Hanno Böck <hanno@schokokeks.org>
 schokokeks.net
 
-// Scottish Government: https://www.gov.scot
-// Submitted by Martin Ellis <martin.ellis@gov.scot>
-gov.scot
-
 // Scry Security : http://www.scrysec.com
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
@@ -12773,10 +12682,6 @@ my-firewall.org
 myfirewall.org
 spdns.org
 
-// Senseering GmbH : https://www.senseering.de
-// Submitted by Felix Mönckemeyer <f.moenckemeyer@senseering.de>
-senseering.net
-
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
 biz.ua
@@ -12795,10 +12700,6 @@ myshopblocks.com
 // Submitted by Craig McMahon <craig@shopitcommerce.com>
 shopitsite.com
 
-// shopware AG : https://shopware.com
-// Submitted by Jens Küper <cloud@shopware.com>
-shopware.store
-
 // Siemens Mobility GmbH
 // Submitted by Oliver Graebner <security@mo-siemens.io>
 mo-siemens.io
@@ -12831,10 +12732,6 @@ static.land
 dev.static.land
 sites.static.land
 
-// Sony Interactive Entertainment LLC : https://sie.com/
-// Submitted by David Coles <david.coles@sony.com>
-playstation-cloud.com
-
 // SourceLair PC : https://www.sourcelair.com
 // Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
 apps.lair.io
@@ -13009,11 +12906,6 @@ inc.hk
 virtualuser.de
 virtual-user.de
 
-// urown.net : https://urown.net
-// Submitted by Hostmaster <hostmaster@urown.net>
-urown.cloud
-dnsupdate.info
-
 // .US
 // Submitted by Ed Moore <Ed.Moore@lib.de.us>
 lib.de.us
@@ -13034,10 +12926,6 @@ v-info.info
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// V.UA Domain Administrator : https://domain.v.ua/
-// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
-v.ua
-
 // Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
@@ -13057,23 +12945,8 @@ wedeploy.sh
 remotewd.com
 
 // Wikimedia Labs : https://wikitech.wikimedia.org
-// Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
+// Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
 wmflabs.org
-toolforge.org
-wmcloud.org
-
-// WISP : https://wisp.gg
-// Submitted by Stepan Fedotov <stepan@wisp.gg>
-panel.gg
-daemon.panel.gg
-
-// WoltLab GmbH : https://www.woltlab.com
-// Submitted by Tim Düsterhus <security@woltlab.cloud>
-myforum.community
-community-pro.de
-diskussionsbereich.de
-community-pro.net
-meinforum.net
 
 // XenonCloud GbR: https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
@@ -13137,10 +13010,7 @@ bss.design
 // Submitted by Emil Stahl <esp@zitcom.dk>
 basicserver.io
 virtualserver.io
+site.builder.nu
 enterprisecloud.nu
 
-// Mintere : https://mintere.com/
-// Submitted by Ben Aubin <security@mintere.com>
-mintere.site
-
 // ===END PRIVATE DOMAINS===

make/data/symbols/java.base-7.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -632,37 +632,10 @@ class name java/security/cert/X509CRL
 class name java/security/cert/X509Certificate
 -method name verify descriptor (Ljava/security/PublicKey;Ljava/security/Provider;)V
 
-class name java/security/interfaces/RSAKey
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
 -class name java/security/spec/DSAGenParameterSpec
 
 class name java/security/spec/MGF1ParameterSpec
 -field name SHA224 descriptor Ljava/security/spec/MGF1ParameterSpec;
--field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec;
--field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec;
-
-class name java/security/spec/PSSParameterSpec
--field name TRAILER_FIELD_BC descriptor I
--method name toString descriptor ()Ljava/lang/String;
-
-class name java/security/spec/RSAKeyGenParameterSpec
--method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
-class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V
-
-class name java/security/spec/RSAPrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
-
-class name java/security/spec/RSAPrivateKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
-class name java/security/spec/RSAPublicKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
 
 class name java/text/Collator
 -method name getInstance descriptor (Ljava/util/Locale;)Ljava/text/Collator;
@@ -1484,14 +1457,6 @@ method name newUpdater descriptor (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/
 
 -class name java/util/function/UnaryOperator
 
-class name java/util/jar/Attributes$Name
--field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name;
--field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name;
--field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name;
-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19
-
 class name java/util/jar/JarFile
 -method name stream descriptor ()Ljava/util/stream/Stream;
 
@@ -1570,9 +1535,6 @@ class name java/util/zip/ZipEntry
 class name java/util/zip/ZipFile
 -method name stream descriptor ()Ljava/util/stream/Stream;
 
-class name javax/crypto/SealedObject
-header extends java/lang/Object implements java/io/Serializable flags 21
-
 class name javax/crypto/SecretKey
 header extends java/lang/Object implements java/security/Key flags 601
 
@@ -1597,12 +1559,6 @@ class name javax/net/ssl/ExtendedSSLSession
 
 -class name javax/net/ssl/SNIServerName
 
-class name javax/net/ssl/SSLEngine
--method name getApplicationProtocol descriptor ()Ljava/lang/String;
--method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String;
--method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V
--method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction;
-
 class name javax/net/ssl/SSLParameters
 -method name setServerNames descriptor (Ljava/util/List;)V
 -method name getServerNames descriptor ()Ljava/util/List;
@@ -1610,14 +1566,6 @@ class name javax/net/ssl/SSLParameters
 -method name getSNIMatchers descriptor ()Ljava/util/Collection;
 -method name setUseCipherSuitesOrder descriptor (Z)V
 -method name getUseCipherSuitesOrder descriptor ()Z
--method name getApplicationProtocols descriptor ()[Ljava/lang/String;
--method name setApplicationProtocols descriptor ([Ljava/lang/String;)V
-
-class name javax/net/ssl/SSLSocket
--method name getApplicationProtocol descriptor ()Ljava/lang/String;
--method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String;
--method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V
--method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction;
 
 class name javax/net/ssl/SSLSocketFactory
 -method name createSocket descriptor (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;

make/data/symbols/java.base-8.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -8200,7 +8200,6 @@ method name getW descriptor ()Ljava/security/spec/ECPoint; flags 401
 class name java/security/interfaces/RSAKey
 header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 401
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/interfaces/RSAMultiPrimePrivateCrtKey
 header extends java/lang/Object implements java/security/interfaces/RSAPrivateKey flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8364,8 +8363,6 @@ field name SHA224 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA256 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA384 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA512 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
-field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
-field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 method name <init> descriptor (Ljava/lang/String;)V flags 1
 method name getDigestAlgorithm descriptor ()Ljava/lang/String; flags 1
 
@@ -8378,7 +8375,6 @@ method name getFormat descriptor ()Ljava/lang/String; flags 11
 class name java/security/spec/PSSParameterSpec
 header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 field name DEFAULT descriptor Ljava/security/spec/PSSParameterSpec; flags 19
-field name TRAILER_FIELD_BC descriptor I constantValue 1 flags 19
 method name <init> descriptor (Ljava/lang/String;Ljava/lang/String;Ljava/security/spec/AlgorithmParameterSpec;II)V flags 1
 method name <init> descriptor (I)V flags 1
 method name getDigestAlgorithm descriptor ()Ljava/lang/String; flags 1
@@ -8386,7 +8382,6 @@ method name getMGFAlgorithm descriptor ()Ljava/lang/String; flags 1
 method name getMGFParameters descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 method name getSaltLength descriptor ()I flags 1
 method name getTrailerField descriptor ()I flags 1
-method name toString descriptor ()Ljava/lang/String; flags 1
 
 class name java/security/spec/RSAKeyGenParameterSpec
 header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8395,8 +8390,6 @@ field name F4 descriptor Ljava/math/BigInteger; flags 19
 method name <init> descriptor (ILjava/math/BigInteger;)V flags 1
 method name getKeysize descriptor ()I flags 1
 method name getPublicExponent descriptor ()Ljava/math/BigInteger; flags 1
-method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
 header extends java/security/spec/RSAPrivateKeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8408,7 +8401,6 @@ method name getPrimeExponentP descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getCrtCoefficient descriptor ()Ljava/math/BigInteger; flags 1
 method name getOtherPrimeInfo descriptor ()[Ljava/security/spec/RSAOtherPrimeInfo; flags 1
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
 
 class name java/security/spec/RSAOtherPrimeInfo
 header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8426,23 +8418,18 @@ method name getPrimeQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentP descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getCrtCoefficient descriptor ()Ljava/math/BigInteger; flags 1
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
 
 class name java/security/spec/RSAPrivateKeySpec
 header extends java/lang/Object implements java/security/spec/KeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;)V flags 1
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrivateExponent descriptor ()Ljava/math/BigInteger; flags 1
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/RSAPublicKeySpec
 header extends java/lang/Object implements java/security/spec/KeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;)V flags 1
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 1
 method name getPublicExponent descriptor ()Ljava/math/BigInteger; flags 1
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/X509EncodedKeySpec
 header extends java/security/spec/EncodedKeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -10442,7 +10429,6 @@ method name values descriptor ()[Ljava/time/chrono/JapaneseEra; flags 9
 method name getValue descriptor ()I flags 1
 method name range descriptor (Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange; flags 1
 method name toString descriptor ()Ljava/lang/String; flags 1
-method name getDisplayName descriptor (Ljava/time/format/TextStyle;Ljava/util/Locale;)Ljava/lang/String; flags 1
 
 class name java/time/chrono/MinguoChronology
 header extends java/time/chrono/AbstractChronology implements java/io/Serializable flags 31 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -15577,15 +15563,15 @@ field name MAIN_CLASS descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SEALED descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name EXTENSION_LIST descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name EXTENSION_NAME descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_TITLE descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_VERSION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_VENDOR descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_TITLE descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_VERSION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_VENDOR descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
 method name <init> descriptor (Ljava/lang/String;)V flags 1
 method name equals descriptor (Ljava/lang/Object;)Z flags 1
 method name hashCode descriptor ()I flags 1
@@ -16712,7 +16698,6 @@ method name <init> descriptor ()V flags 1
 
 class name javax/crypto/SealedObject
 header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 field name encodedParams descriptor [B flags 4
 method name <init> descriptor (Ljava/io/Serializable;Ljavax/crypto/Cipher;)V thrownTypes java/io/IOException,javax/crypto/IllegalBlockSizeException flags 1
 method name <init> descriptor (Ljavax/crypto/SealedObject;)V flags 4
@@ -17101,10 +17086,6 @@ method name setEnableSessionCreation descriptor (Z)V flags 401
 method name getEnableSessionCreation descriptor ()Z flags 401
 method name getSSLParameters descriptor ()Ljavax/net/ssl/SSLParameters; flags 1
 method name setSSLParameters descriptor (Ljavax/net/ssl/SSLParameters;)V flags 1
-method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 
 class name javax/net/ssl/SSLEngineResult
 header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -17175,8 +17156,6 @@ method name setSNIMatchers descriptor (Ljava/util/Collection;)V flags 11 signatu
 method name getSNIMatchers descriptor ()Ljava/util/Collection; flags 11 signature ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
 method name setUseCipherSuitesOrder descriptor (Z)V flags 11
 method name getUseCipherSuitesOrder descriptor ()Z flags 11
-method name getApplicationProtocols descriptor ()[Ljava/lang/String; flags 1
-method name setApplicationProtocols descriptor ([Ljava/lang/String;)V flags 1
 
 class name javax/net/ssl/SSLPeerUnverifiedException
 header extends javax/net/ssl/SSLException flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -17293,10 +17272,6 @@ method name setEnableSessionCreation descriptor (Z)V flags 401
 method name getEnableSessionCreation descriptor ()Z flags 401
 method name getSSLParameters descriptor ()Ljavax/net/ssl/SSLParameters; flags 1
 method name setSSLParameters descriptor (Ljavax/net/ssl/SSLParameters;)V flags 1
-method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 
 class name javax/net/ssl/SSLSocketFactory
 header extends javax/net/SocketFactory flags 421 classAnnotations @Ljdk/Profile+Annotation;(value=I1)

make/data/symbols/java.base-9.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -2083,42 +2083,13 @@ method name equals descriptor (Ljava/lang/Object;)Z flags 1
 method name toString descriptor ()Ljava/lang/String; flags 1
 method name clone descriptor ()Ljava/lang/Object; thrownTypes java/lang/CloneNotSupportedException flags 1041
 
-class name java/security/interfaces/RSAKey
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
 class name java/security/spec/EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 4
 method name getAlgorithm descriptor ()Ljava/lang/String; flags 1
 
-class name java/security/spec/MGF1ParameterSpec
--field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec;
--field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec;
-
 class name java/security/spec/PKCS8EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 1
 
-class name java/security/spec/PSSParameterSpec
--field name TRAILER_FIELD_BC descriptor I
--method name toString descriptor ()Ljava/lang/String;
-
-class name java/security/spec/RSAKeyGenParameterSpec
--method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
-class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V
-
-class name java/security/spec/RSAPrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
-
-class name java/security/spec/RSAPrivateKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
-class name java/security/spec/RSAPublicKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-
 class name java/security/spec/X509EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 1
 
@@ -2253,6 +2224,9 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
 class name java/time/chrono/IsoChronology
 method name epochSecond descriptor (IIIIIILjava/time/ZoneOffset;)J flags 1
 
+class name java/time/chrono/JapaneseEra
+method name getDisplayName descriptor (Ljava/time/format/TextStyle;Ljava/util/Locale;)Ljava/lang/String; flags 1
+
 class name java/time/format/DateTimeFormatter
 header extends java/lang/Object flags 31
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
@@ -3247,6 +3221,12 @@ header extends java/lang/Object implements java/util/function/Function flags 601
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 
 class name java/util/jar/Attributes$Name
+-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name;
+-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name;
+-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name;
+field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
 field name MULTI_RELEASE descriptor Ljava/util/jar/Attributes$Name; flags 19
 
 class name java/util/jar/JarFile
@@ -3401,9 +3381,6 @@ method name finalize descriptor ()V thrownTypes java/io/IOException flags 4 depr
 class name javax/crypto/ExemptionMechanism
 -method name finalize descriptor ()V
 
-class name javax/crypto/SealedObject
-header extends java/lang/Object implements java/io/Serializable flags 21
-
 class name javax/net/ssl/ExtendedSSLSession
 method name getStatusResponses descriptor ()Ljava/util/List; flags 1 signature ()Ljava/util/List<[B>;
 
@@ -3411,6 +3388,12 @@ class name javax/net/ssl/HandshakeCompletedEvent
 -method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate;
 method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate; thrownTypes javax/net/ssl/SSLPeerUnverifiedException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
 
+class name javax/net/ssl/SSLEngine
+method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
+method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+
 class name javax/net/ssl/SSLEngineResult
 header extends java/lang/Object flags 21
 innerclass innerClass javax/net/ssl/SSLEngineResult$HandshakeStatus outerClass javax/net/ssl/SSLEngineResult innerClassName HandshakeStatus flags 4019
@@ -3426,11 +3409,19 @@ method name setEnableRetransmissions descriptor (Z)V flags 1
 method name getEnableRetransmissions descriptor ()Z flags 1
 method name setMaximumPacketSize descriptor (I)V flags 1
 method name getMaximumPacketSize descriptor ()I flags 1
+method name getApplicationProtocols descriptor ()[Ljava/lang/String; flags 1
+method name setApplicationProtocols descriptor ([Ljava/lang/String;)V flags 1
 
 class name javax/net/ssl/SSLSession
 -method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate;
 method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate; thrownTypes javax/net/ssl/SSLPeerUnverifiedException flags 401 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
 
+class name javax/net/ssl/SSLSocket
+method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
+method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+
 class name javax/security/auth/Policy
 header extends java/lang/Object flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="1.4")
 

make/data/symbols/java.desktop-7.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -77,9 +77,6 @@ class name javax/swing/ImageIcon
 field name component descriptor Ljava/awt/Component; flags 1c
 field name tracker descriptor Ljava/awt/MediaTracker; flags 1c
 
-class name javax/swing/JComboBox
--method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
-
 class name javax/swing/JComponent
 field name accessibleContext descriptor Ljavax/accessibility/AccessibleContext; flags 4
 -method name hide descriptor ()V
@@ -93,12 +90,8 @@ field name accessibleFocusHandler descriptor Ljava/awt/event/FocusListener; flag
 class name javax/swing/JDesktopPane
 -method name remove descriptor (Ljava/awt/Component;)V
 
-class name javax/swing/JList$AccessibleJList$AccessibleJListChild
-method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
-
-class name javax/swing/plaf/basic/BasicRadioButtonUI
--method name installListeners descriptor (Ljavax/swing/AbstractButton;)V
--method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V
+class name javax/swing/JViewport
+-method name addNotify descriptor ()V
 
 class name javax/swing/tree/DefaultMutableTreeNode
 -method name setParent descriptor (Ljavax/swing/tree/MutableTreeNode;)V

make/data/symbols/java.desktop-8.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -13524,7 +13524,6 @@ method name getItemAt descriptor (I)Ljava/lang/Object; flags 1 signature (I)TE;
 method name createDefaultKeySelectionManager descriptor ()Ljavax/swing/JComboBox$KeySelectionManager; flags 4
 method name paramString descriptor ()Ljava/lang/String; flags 4
 method name getAccessibleContext descriptor ()Ljavax/accessibility/AccessibleContext; flags 1
-method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z flags 4
 
 class name javax/swing/JComboBox$AccessibleJComboBox
 header extends javax/swing/JComponent$AccessibleJComponent implements javax/accessibility/AccessibleAction,javax/accessibility/AccessibleSelection flags 21
@@ -14605,6 +14604,7 @@ method name getAccessibleChild descriptor (I)Ljavax/accessibility/Accessible; fl
 method name getLocale descriptor ()Ljava/util/Locale; flags 1
 method name addPropertyChangeListener descriptor (Ljava/beans/PropertyChangeListener;)V flags 1
 method name removePropertyChangeListener descriptor (Ljava/beans/PropertyChangeListener;)V flags 1
+method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
 method name getAccessibleComponent descriptor ()Ljavax/accessibility/AccessibleComponent; flags 1
 method name getAccessibleSelection descriptor ()Ljavax/accessibility/AccessibleSelection; flags 1
 method name getAccessibleText descriptor ()Ljavax/accessibility/AccessibleText; flags 1
@@ -16720,6 +16720,7 @@ method name updateUI descriptor ()V flags 1
 method name getUIClassID descriptor ()Ljava/lang/String; flags 1
 method name addImpl descriptor (Ljava/awt/Component;Ljava/lang/Object;I)V flags 4
 method name remove descriptor (Ljava/awt/Component;)V flags 1
+method name addNotify descriptor ()V flags 1
 method name scrollRectToVisible descriptor (Ljava/awt/Rectangle;)V flags 1
 method name setBorder descriptor (Ljavax/swing/border/Border;)V flags 11
 method name getInsets descriptor ()Ljava/awt/Insets; flags 11
@@ -20280,8 +20281,6 @@ method name getDefaultIcon descriptor ()Ljavax/swing/Icon; flags 1
 method name paint descriptor (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V flags 21
 method name paintFocus descriptor (Ljava/awt/Graphics;Ljava/awt/Rectangle;Ljava/awt/Dimension;)V flags 4
 method name getPreferredSize descriptor (Ljavax/swing/JComponent;)Ljava/awt/Dimension; flags 1
-method name installListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
-method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
 
 class name javax/swing/plaf/basic/BasicRootPaneUI
 header extends javax/swing/plaf/RootPaneUI implements java/beans/PropertyChangeListener flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)

make/data/symbols/java.desktop-9.sym.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -2524,6 +2524,7 @@ method name getPopupMenuListeners descriptor ()[Ljavax/swing/event/PopupMenuList
 method name setAction descriptor (Ljavax/swing/Action;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(visualUpdate=Ztrue,description="the\u005C;u0020;Action\u005C;u0020;instance\u005C;u0020;connected\u005C;u0020;with\u005C;u0020;this\u005C;u0020;ActionEvent\u005C;u0020;source")
 method name getSelectedObjects descriptor ()[Ljava/lang/Object; flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
 method name setEnabled descriptor (Z)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(description="The\u005C;u0020;enabled\u005C;u0020;state\u005C;u0020;of\u005C;u0020;the\u005C;u0020;component.",preferred=Ztrue)
+method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z flags 4
 method name setKeySelectionManager descriptor (Ljavax/swing/JComboBox$KeySelectionManager;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(expert=Ztrue,bound=Zfalse,description="The\u005C;u0020;objects\u005C;u0020;that\u005C;u0020;changes\u005C;u0020;the\u005C;u0020;selection\u005C;u0020;when\u005C;u0020;a\u005C;u0020;key\u005C;u0020;is\u005C;u0020;pressed.")
 method name getItemCount descriptor ()I flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
 method name getAccessibleContext descriptor ()Ljavax/accessibility/AccessibleContext; flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
@@ -3038,7 +3039,6 @@ class name javax/swing/JList$AccessibleJList$AccessibleJListChild
 header extends javax/accessibility/AccessibleContext implements javax/accessibility/Accessible,javax/accessibility/AccessibleComponent,javax/accessibility/AccessibleAction flags 21
 innerclass innerClass javax/swing/JList$AccessibleJList outerClass javax/swing/JList innerClassName AccessibleJList flags 4
 innerclass innerClass javax/swing/JList$AccessibleJList$AccessibleJListChild outerClass javax/swing/JList$AccessibleJList innerClassName AccessibleJListChild flags 4
-method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
 method name doAccessibleAction descriptor (I)Z flags 1
 method name getAccessibleActionDescription descriptor (I)Ljava/lang/String; flags 1
 method name getAccessibleActionCount descriptor ()I flags 1
@@ -3907,6 +3907,7 @@ innerclass innerClass javax/swing/JViewport$AccessibleJViewport outerClass javax
 innerclass innerClass javax/swing/JViewport$ViewListener outerClass javax/swing/JViewport innerClassName ViewListener flags 4
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 -method name setUI descriptor (Ljavax/swing/plaf/ViewportUI;)V
+-method name addNotify descriptor ()V
 -method name getInsets descriptor (Ljava/awt/Insets;)Ljava/awt/Insets;
 -method name setScrollMode descriptor (I)V
 method name setUI descriptor (Ljavax/swing/plaf/ViewportUI;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(hidden=Ztrue,visualUpdate=Ztrue,description="The\u005C;u0020;UI\u005C;u0020;object\u005C;u0020;that\u005C;u0020;implements\u005C;u0020;the\u005C;u0020;Component's\u005C;u0020;LookAndFeel.")
@@ -4401,6 +4402,8 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
 class name javax/swing/plaf/basic/BasicRadioButtonUI
 header extends javax/swing/plaf/basic/BasicToggleButtonUI flags 21
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+method name installListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
+method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
 
 class name javax/swing/plaf/basic/BasicScrollBarUI
 header extends javax/swing/plaf/ScrollBarUI implements java/awt/LayoutManager,javax/swing/SwingConstants flags 21

make/data/symbols/symbols

@@ -27,7 +27,7 @@
 # ##########################################################
 #
 #command used to generate this file:
-#build.tools.symbolgenerator.CreateSymbols build-description-incremental-file symbols include.list 8 jdk8-updated.classes <none> --normalize-method-flags
+#build.tools.symbolgenerator.CreateSymbols build-description-incremental symbols include.list
 #
 generate platforms 6:7:8:9:A
 platform version 8 files java.activation-8.sym.txt:java.base-8.sym.txt:java.compiler-8.sym.txt:java.corba-8.sym.txt:java.datatransfer-8.sym.txt:java.desktop-8.sym.txt:java.instrument-8.sym.txt:java.logging-8.sym.txt:java.management-8.sym.txt:java.management.rmi-8.sym.txt:java.naming-8.sym.txt:java.prefs-8.sym.txt:java.rmi-8.sym.txt:java.scripting-8.sym.txt:java.security.jgss-8.sym.txt:java.security.sasl-8.sym.txt:java.sql-8.sym.txt:java.sql.rowset-8.sym.txt:java.transaction-8.sym.txt:java.xml-8.sym.txt:java.xml.bind-8.sym.txt:java.xml.crypto-8.sym.txt:java.xml.ws-8.sym.txt:java.xml.ws.annotation-8.sym.txt:jdk.httpserver-8.sym.txt:jdk.management-8.sym.txt:jdk.scripting.nashorn-8.sym.txt:jdk.sctp-8.sym.txt:jdk.security.auth-8.sym.txt:jdk.security.jgss-8.sym.txt

make/gensrc/GensrcMisc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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,12 +27,6 @@
 # Install the launcher name, release version string, full version
 # string and the runtime name into the VersionProps.java file.
 
-ifeq ($(COMPANY_NAME), N/A)
-  VENDOR=Oracle Corporation
-else
-  VENDOR=$(COMPANY_NAME)
-endif
-
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
     SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
     OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/VersionProps.java, \
@@ -47,7 +41,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
         @@VERSION_OPT@@ => $(VERSION_OPT) ; \
         @@VERSION_DATE@@ => $(VERSION_DATE) ; \
         @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \
-        @@VENDOR@@ => $(VENDOR) ; \
+        @@VENDOR@@ => $(COMPANY_NAME) ; \
         @@VENDOR_URL@@ => $(VENDOR_URL) ; \
         @@VENDOR_URL_BUG@@ => $(VENDOR_URL_BUG) ; \
         @@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -62,10 +62,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
-  ifneq ($(call check-jvm-feature, shenandoahgc), true)
-    ADLC_CFLAGS += -DINCLUDE_SHENANDOAHGC=0
-  endif
-
   $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
       NAME := adlc, \
       TYPE := EXECUTABLE, \
@@ -140,12 +136,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
       $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH).ad \
     )))
 
-  ifeq ($(call check-jvm-feature, shenandoahgc), true)
-    AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
-        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/shenandoah/shenandoah_$(HOTSPOT_TARGET_CPU).ad \
-      )))
-  endif
-
   SINGLE_AD_SRCFILE := $(ADLC_SUPPORT_DIR)/all-ad-src.ad
 
   INSERT_FILENAME_AWK_SCRIPT := \

make/hotspot/lib/JvmFeatures.gmk

@@ -166,11 +166,6 @@ ifneq ($(call check-jvm-feature, zgc), true)
   JVM_EXCLUDE_PATTERNS += gc/z
 endif
 
-ifneq ($(call check-jvm-feature, shenandoahgc), true)
-  JVM_CFLAGS_FEATURES += -DINCLUDE_SHENANDOAHGC=0
-  JVM_EXCLUDE_PATTERNS += gc/shenandoah
-endif
-
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -36,10 +36,6 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
-  ifeq ($(DEBUG_LEVEL), release)
-    # Need extra inlining to collapse all marking code into the hot marking loop
-    BUILD_LIBJVM_shenandoahConcurrentMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
-  endif
 endif
 
 LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
@@ -136,6 +132,9 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
     # NOTE: The old build tested clang version to make sure this workaround
     # for the clang bug was still needed.
     BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
+    ifneq ($(DEBUG_LEVEL), slowdebug)
+      BUILD_LIBJVM_unsafe.cpp_CXXFLAGS := -O1
+    endif
 
     # The following files are compiled at various optimization
     # levels due to optimization issues encountered at the
@@ -151,6 +150,7 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
         sharedRuntimeTrig.cpp \
         sharedRuntimeTrans.cpp \
         loopTransform.cpp \
+        unsafe.cpp \
         jvmciCompilerToVM.cpp \
         #
   endif