fixup! JBR-4154 extract version info from sources

README.md

@@ -11,7 +11,6 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR | Date Released |
 |  ---        | ---        | ---           |
-| 2022.1      | [17_0_2-b315.1](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr17_0_2b315.1) | 09-Feb-2022 |
 | 2021.3      | [17_0_1-b164.8](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr17_0_1b164.8) | 15-Nov-2021 |
 
 ## Contents

jb/project/docker/Dockerfile.aarch64

@@ -31,7 +31,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxt-dev \
         libxtst-dev \
         make \
-        rsync \
         tar \
         unzip \
         zip && \

jb/project/docker/Dockerfile.musl_aarch64

@@ -1,22 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_aarch64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM arm64v8/alpine:3.12
-
-# Install the necessary build tools
-RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
-	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
-	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
-	    fontconfig fontconfig-dev linux-headers
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_aarch64.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_aarch64.tar.gz && rm /jdk17/boot_jdk_musl_aarch64.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_x64

@@ -1,22 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM alpine:3.5
-
-# Install the necessary build tools
-RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
-	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
-	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
-	    fontconfig fontconfig-dev linux-headers
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_amd64.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk17/boot_jdk_musl_amd64.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# This script creates a Docker image suitable for building musl AArch64 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64.tar.gz
-BOOT_JDK_SHA=6b920559abafbe9bdef386a20ecf3a2f318bc1f0d8359eb1f95aee26606bbc70
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_aarch64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbr17buildenv -f Dockerfile.musl_aarch64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# This script creates a Docker image suitable for building musl-x64 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_x64.tar.gz
-BOOT_JDK_SHA=bcc5342011bd9f3643372aadbdfa68d47463ff0d8621668a0bdf2910614d95c6
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_amd64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbr17buildenv -f Dockerfile.musl_x64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/tools/common/scripts/common.sh

@@ -30,15 +30,13 @@ architecture=$3 # aarch64 or x64
 
 bundle_type=$(do_maketest)
 do_maketest=$?
-tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1)
+
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
 [[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
 echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
-JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
-[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
+JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=0}
 echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
 
 VENDOR_NAME="JetBrains s.r.o."
@@ -77,27 +75,15 @@ case "$OS_NAME" in
         ;;
 esac
 
-WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
-
 REPRODUCIBLE_BUILD_OPTS="--enable-reproducible-build
   --with-source-date=$SOURCE_DATE_EPOCH
   --with-hotspot-build-time=$BUILD_TIME
   --with-copyright-year=$COPYRIGHT_YEAR
   --disable-absolute-paths-in-output"
 
-function zip_native_debug_symbols() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jbr_diz_name=$2
-
-  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} ../../../../dizfiles \; )
-
-  (cd dizfiles && find . -print0 | COPYFILE_DISABLE=1 \
-    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
-}
-
 function do_exit() {
   exit_code=$1
-  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+  [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
   if [ $do_reset_dcevm -eq 1 ]; then
     [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
   fi

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

@@ -6,21 +6,8 @@
 
 source jb/project/tools/common/scripts/common.sh
 
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-LIBC_TYPE_SUFFIX=''
-
-if is_musl; then LIBC_TYPE_SUFFIX='musl-' ; fi
-
 sh configure \
   --with-debug-level=release \
   --with-vendor-name="${VENDOR_NAME}" \
@@ -32,12 +19,11 @@ sh configure \
   --with-boot-jdk=${BOOT_JDK} \
   --enable-cds=yes \
   $REPRODUCIBLE_BUILD_OPTS \
-  $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
   || exit $?
 make clean CONF=linux-aarch64-server-release || exit $?
 make images CONF=linux-aarch64-server-release test-image || exit $?
 
-JBSDK=${JBRSDK_BASE_NAME}-linux-${LIBC_TYPE_SUFFIX}aarch64-b${build_number}
+JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}
 BASE_DIR=build/linux-aarch64-server-release/images
 JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
@@ -52,8 +38,6 @@ echo Creating $JBSDK.tar.gz ...
 sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
 mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 
-zip_native_debug_symbols $JSDK "${JBSDK}_diz"
-
 # NB: --sort=name requires tar1.28
 tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBSDK.tar \
   --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
@@ -65,8 +49,8 @@ JBR_BUNDLE=jbr
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
 rm -rf $BASE_DIR/$JBR_BUNDLE
 
-JBR=$JBR_BASE_NAME-linux-${LIBC_TYPE_SUFFIX}aarch64-b$build_number
-grep -v javafx jb/project/tools/common/modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.aarch64
+JBR=$JBR_BASE_NAME-linux-aarch64-b$build_number
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.aarch64
 echo Running jlink....
 ${JSDK}/bin/jlink \
   --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
@@ -81,7 +65,7 @@ tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE}
 touch -c -d @$SOURCE_DATE_EPOCH $JBR.tar
 gzip $JBR.tar || exit $?
 
-JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-${LIBC_TYPE_SUFFIX}test-aarch64-b$build_number
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-aarch64-b$build_number
 echo Creating $JBRSDK_TEST.tar.gz ...
 tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
 gzip $JBRSDK_TEST.tar || exit $?

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

@@ -33,31 +33,17 @@ function do_configure {
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
     $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     || do_exit $?
 }
 
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
 function create_image_bundle {
   __bundle_name=$1
   __arch_name=$2
   __modules_path=$3
   __modules=$4
 
-  libc_type_suffix=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink....
   [ -d "$IMAGES_DIR"/"$__arch_name" ] && rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
@@ -70,7 +56,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
     mv release "$IMAGES_DIR"/"$__arch_name"/release
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)
@@ -95,7 +80,6 @@ RELEASE_NAME=linux-x86_64-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=1
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -130,7 +114,7 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
 fi
 
 # create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
@@ -140,10 +124,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
 
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
+if [ "$bundle_type" == "jcef" ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-test-x64-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
     make test-image CONF=$RELEASE_NAME || do_exit $?
     tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"

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

@@ -61,7 +61,7 @@ JBR_BASE_NAME=jbr-$JBSDK_VERSION
 rm -rf $BASE_DIR/$JBR_BUNDLE
 
 JBR=$JBR_BASE_NAME-linux-x86-b$build_number
-grep -v javafx jb/project/tools/common/modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
 echo Running jlink....
 ${JSDK}/bin/jlink \
   --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
@@ -77,4 +77,4 @@ gzip $JBR.tar || exit $?
 JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x86-b$build_number
 echo Creating $JBRSDK_TEST.tar.gz ...
 tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' --exclude='test/hotspot/gtest' test || exit $?
-gzip $JBRSDK_TEST.tar || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

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

@@ -45,7 +45,6 @@ function do_configure {
       --with-extra-cxxflags="-F$(pwd)/Frameworks" \
       --with-extra-ldflags="-F$(pwd)/Frameworks" \
       $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
       || do_exit $?
   else
     sh configure \
@@ -62,7 +61,6 @@ function do_configure {
       --with-macosx-version-max="${MACOSX_VERSION_MAX:="10.12.00"}" \
       --enable-cds=yes \
       $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
       || do_exit $?
   fi
 }
@@ -92,7 +90,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
 
   cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
@@ -122,7 +119,6 @@ RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=1
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -156,7 +152,7 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
 fi
 
 # create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
@@ -166,10 +162,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
-if [ $do_maketest -eq 1 ]; then
+if [ "$bundle_type" == "jcef" ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
     make test-image CONF=$RELEASE_NAME || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?

jb/project/tools/patches/add_jcef_module.patch

@@ -1,8 +1,8 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7cb43..c40e689d5de 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+diff --git modules.list modules.list
+index 054f21d1ee0..d9a121f0273 100644
+--- modules.list
++++ modules.list
+@@ -49,4 +49,7 @@ jdk.unsupported,
  jdk.xml.dom,
  jdk.zipfs,
  jdk.hotspot.agent,

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

@@ -66,7 +66,6 @@ RELEASE_NAME=windows-x86_64-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=0
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -80,13 +79,13 @@ esac
 
 if [ -z "$INC_BUILD" ]; then
   do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
+  if [ "$bundle_type" == "jcef" ]; then
     make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
-  if [ $do_maketest -eq 1 ]; then
+  if [ "$bundle_type" == "jcef" ]; then
     make LOG=info CONF=$RELEASE_NAME images test-image || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME images || do_exit $?
@@ -107,8 +106,7 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
 fi
 
 # create runtime image bundlef
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle

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

@@ -53,8 +53,7 @@ mv release ${JBRSDK_BUNDLE}/release
 
 JBR_BUNDLE=jbr
 rm -rf ${JBR_BUNDLE}
-grep -v javafx jb/project/tools/common/modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
-echo ",jdk.crypto.mscapi" >> modules.list.x86
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
 ${JSDK}/bin/jlink \
   --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
   --add-modules $(xargs < modules.list.x86 | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?

src/hotspot/share/opto/loopPredicate.cpp

@@ -341,9 +341,9 @@ void PhaseIdealLoop::clone_skeleton_predicates_to_unswitched_loop(IdealLoopTree*
     assert(predicate->is_Proj() && predicate->as_Proj()->is_IfProj(), "predicate must be a projection of an if node");
     IfProjNode* predicate_proj = predicate->as_IfProj();
 
-    ProjNode* fast_proj = clone_skeleton_predicate_for_unswitched_loops(iff, predicate_proj, reason, iffast_pred);
+    ProjNode* fast_proj = clone_skeleton_predicate_for_unswitched_loops(iff, predicate_proj, uncommon_proj, reason, iffast_pred, loop);
     assert(skeleton_predicate_has_opaque(fast_proj->in(0)->as_If()), "must find skeleton predicate for fast loop");
-    ProjNode* slow_proj = clone_skeleton_predicate_for_unswitched_loops(iff, predicate_proj, reason, ifslow_pred);
+    ProjNode* slow_proj = clone_skeleton_predicate_for_unswitched_loops(iff, predicate_proj, uncommon_proj, reason, ifslow_pred, loop);
     assert(skeleton_predicate_has_opaque(slow_proj->in(0)->as_If()), "must find skeleton predicate for slow loop");
 
     // Update control dependent data nodes.
@@ -397,10 +397,10 @@ void PhaseIdealLoop::get_skeleton_predicates(Node* predicate, Unique_Node_List&
 // Clone a skeleton predicate for an unswitched loop. OpaqueLoopInit and OpaqueLoopStride nodes are cloned and uncommon
 // traps are kept for the predicate (a Halt node is used later when creating pre/main/post loops and copying this cloned
 // predicate again).
-ProjNode* PhaseIdealLoop::clone_skeleton_predicate_for_unswitched_loops(Node* iff, ProjNode* predicate,
-                                                                        Deoptimization::DeoptReason reason,
-                                                                        ProjNode* output_proj) {
-  Node* bol = clone_skeleton_predicate_bool(iff, NULL, NULL, output_proj);
+ProjNode* PhaseIdealLoop::clone_skeleton_predicate_for_unswitched_loops(Node* iff, ProjNode* predicate, Node* uncommon_proj,
+                                                                    Deoptimization::DeoptReason reason, ProjNode* output_proj,
+                                                                    IdealLoopTree* loop) {
+  Node* bol = clone_skeleton_predicate_bool(iff, NULL, NULL, predicate, uncommon_proj, output_proj, loop);
   ProjNode* proj = create_new_if_for_predicate(output_proj, NULL, reason, iff->Opcode(), predicate->is_IfTrue());
   _igvn.replace_input_of(proj->in(0), 1, bol);
   _igvn.replace_input_of(output_proj->in(0), 0, proj);

src/hotspot/share/opto/loopTransform.cpp

@@ -1264,12 +1264,10 @@ void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop_helper(Node* predicat
         // Clone the skeleton predicate twice and initialize one with the initial
         // value of the loop induction variable. Leave the other predicate
         // to be initialized when increasing the stride during loop unrolling.
-        prev_proj = clone_skeleton_predicate_for_main_or_post_loop(iff, opaque_init, NULL, predicate, uncommon_proj,
-                                                                   current_proj, outer_loop, prev_proj);
+        prev_proj = clone_skeleton_predicate_for_main_loop(iff, opaque_init, NULL, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
         assert(skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "");
 
-        prev_proj = clone_skeleton_predicate_for_main_or_post_loop(iff, init, stride, predicate, uncommon_proj,
-                                                                   current_proj, outer_loop, prev_proj);
+        prev_proj = clone_skeleton_predicate_for_main_loop(iff, init, stride, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
         assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "");
 
         // Rewire any control inputs from the cloned skeleton predicates down to the main and post loop for data nodes that are part of the
@@ -1346,7 +1344,8 @@ bool PhaseIdealLoop::skeleton_predicate_has_opaque(IfNode* iff) {
 // Clone the skeleton predicate bool for a main or unswitched loop:
 // Main loop: Set new_init and new_stride nodes as new inputs.
 // Unswitched loop: new_init and new_stride are both NULL. Clone OpaqueLoopInit and OpaqueLoopStride instead.
-Node* PhaseIdealLoop::clone_skeleton_predicate_bool(Node* iff, Node* new_init, Node* new_stride, Node* control) {
+Node* PhaseIdealLoop::clone_skeleton_predicate_bool(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj,
+                                                    Node* control, IdealLoopTree* outer_loop) {
   Node_Stack to_clone(2);
   to_clone.push(iff->in(1), 1);
   uint current = C->unique();
@@ -1422,9 +1421,9 @@ Node* PhaseIdealLoop::clone_skeleton_predicate_bool(Node* iff, Node* new_init, N
 
 // Clone a skeleton predicate for the main loop. new_init and new_stride are set as new inputs. Since the predicates cannot fail at runtime,
 // Halt nodes are inserted instead of uncommon traps.
-Node* PhaseIdealLoop::clone_skeleton_predicate_for_main_or_post_loop(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj,
-                                                                     Node* control, IdealLoopTree* outer_loop, Node* input_proj) {
-  Node* result = clone_skeleton_predicate_bool(iff, new_init, new_stride, control);
+Node* PhaseIdealLoop::clone_skeleton_predicate_for_main_loop(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj,
+                                                             Node* control, IdealLoopTree* outer_loop, Node* input_proj) {
+  Node* result = clone_skeleton_predicate_bool(iff, new_init, new_stride, predicate, uncommon_proj, control, outer_loop);
   Node* proj = predicate->clone();
   Node* other_proj = uncommon_proj->clone();
   Node* new_iff = iff->clone();
@@ -1438,8 +1437,8 @@ Node* PhaseIdealLoop::clone_skeleton_predicate_for_main_or_post_loop(Node* iff,
   C->root()->add_req(halt);
   new_iff->set_req(0, input_proj);
 
-  register_control(new_iff, outer_loop == _ltree_root ? _ltree_root : outer_loop->_parent, input_proj);
-  register_control(proj, outer_loop == _ltree_root ? _ltree_root : outer_loop->_parent, new_iff);
+  register_control(new_iff, outer_loop->_parent, input_proj);
+  register_control(proj, outer_loop->_parent, new_iff);
   register_control(other_proj, _ltree_root, new_iff);
   register_control(halt, _ltree_root, other_proj);
   return proj;
@@ -1522,8 +1521,7 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
   // Add the post loop
   const uint idx_before_pre_post = Compile::current()->unique();
   CountedLoopNode *post_head = NULL;
-  Node* post_incr = incr;
-  Node* main_exit = insert_post_loop(loop, old_new, main_head, main_end, post_incr, limit, post_head);
+  Node *main_exit = insert_post_loop(loop, old_new, main_head, main_end, incr, limit, post_head);
   const uint idx_after_post_before_pre = Compile::current()->unique();
 
   //------------------------------
@@ -1622,7 +1620,6 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
   assert(post_head->in(1)->is_IfProj(), "must be zero-trip guard If node projection of the post loop");
   copy_skeleton_predicates_to_main_loop(pre_head, castii, stride, outer_loop, outer_main_head, dd_main_head,
                                         idx_before_pre_post, idx_after_post_before_pre, min_taken, post_head->in(1), old_new);
-  copy_skeleton_predicates_to_post_loop(outer_main_head, post_head, post_incr, stride);
 
   // Step B4: Shorten the pre-loop to run only 1 iteration (for now).
   // RCE and alignment may change this later.
@@ -1745,7 +1742,6 @@ void PhaseIdealLoop::insert_vector_post_loop(IdealLoopTree *loop, Node_List &old
   // In this case we throw away the result as we are not using it to connect anything else.
   CountedLoopNode *post_head = NULL;
   insert_post_loop(loop, old_new, main_head, main_end, incr, limit, post_head);
-  copy_skeleton_predicates_to_post_loop(main_head->skip_strip_mined(), post_head, incr, main_head->stride());
 
   // It's difficult to be precise about the trip-counts
   // for post loops.  They are usually very short,
@@ -1792,7 +1788,6 @@ void PhaseIdealLoop::insert_scalar_rced_post_loop(IdealLoopTree *loop, Node_List
   // In this case we throw away the result as we are not using it to connect anything else.
   CountedLoopNode *post_head = NULL;
   insert_post_loop(loop, old_new, main_head, main_end, incr, limit, post_head);
-  copy_skeleton_predicates_to_post_loop(main_head->skip_strip_mined(), post_head, incr, main_head->stride());
 
   // It's difficult to be precise about the trip-counts
   // for post loops.  They are usually very short,
@@ -1809,9 +1804,9 @@ void PhaseIdealLoop::insert_scalar_rced_post_loop(IdealLoopTree *loop, Node_List
 
 //------------------------------insert_post_loop-------------------------------
 // Insert post loops.  Add a post loop to the given loop passed.
-Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
-                                       CountedLoopNode* main_head, CountedLoopEndNode* main_end,
-                                       Node*& incr, Node* limit, CountedLoopNode*& post_head) {
+Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree *loop, Node_List &old_new,
+                                       CountedLoopNode *main_head, CountedLoopEndNode *main_end,
+                                       Node *incr, Node *limit, CountedLoopNode *&post_head) {
   IfNode* outer_main_end = main_end;
   IdealLoopTree* outer_loop = loop;
   if (main_head->is_strip_mined()) {
@@ -1895,8 +1890,8 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
   }
 
   // CastII for the new post loop:
-  incr = cast_incr_before_loop(zer_opaq->in(1), zer_taken, post_head);
-  assert(incr != NULL, "no castII inserted");
+  Node* castii = cast_incr_before_loop(zer_opaq->in(1), zer_taken, post_head);
+  assert(castii != NULL, "no castII inserted");
 
   return new_main_exit;
 }
@@ -1938,8 +1933,7 @@ void PhaseIdealLoop::update_main_loop_skeleton_predicates(Node* ctrl, CountedLoo
         _igvn.replace_input_of(iff, 1, iff->in(1)->in(2));
       } else {
         // Add back predicates updated for the new stride.
-        prev_proj = clone_skeleton_predicate_for_main_or_post_loop(iff, init, max_value, entry, proj, ctrl, outer_loop,
-                                                                   prev_proj);
+        prev_proj = clone_skeleton_predicate_for_main_loop(iff, init, max_value, entry, proj, ctrl, outer_loop, prev_proj);
         assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "unexpected");
       }
     }
@@ -1951,34 +1945,6 @@ void PhaseIdealLoop::update_main_loop_skeleton_predicates(Node* ctrl, CountedLoo
   }
 }
 
-void PhaseIdealLoop::copy_skeleton_predicates_to_post_loop(LoopNode* main_loop_head, CountedLoopNode* post_loop_head, Node* init, Node* stride) {
-  // Go over the skeleton predicates of the main loop and make a copy for the post loop with its initial iv value and
-  // stride as inputs.
-  Node* post_loop_entry = post_loop_head->in(LoopNode::EntryControl);
-  Node* main_loop_entry = main_loop_head->in(LoopNode::EntryControl);
-  IdealLoopTree* post_loop = get_loop(post_loop_head);
-
-  Node* ctrl = main_loop_entry;
-  Node* prev_proj = post_loop_entry;
-  while (ctrl != NULL && ctrl->is_Proj() && ctrl->in(0)->is_If()) {
-    IfNode* iff = ctrl->in(0)->as_If();
-    ProjNode* proj = iff->proj_out(1 - ctrl->as_Proj()->_con);
-    if (proj->unique_ctrl_out()->Opcode() != Op_Halt) {
-      break;
-    }
-    if (iff->in(1)->Opcode() == Op_Opaque4 && skeleton_predicate_has_opaque(iff)) {
-      prev_proj = clone_skeleton_predicate_for_main_or_post_loop(iff, init, stride, ctrl, proj, post_loop_entry,
-                                                                 post_loop, prev_proj);
-      assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "unexpected");
-    }
-    ctrl = ctrl->in(0)->in(0);
-  }
-  if (prev_proj != post_loop_entry) {
-    _igvn.replace_input_of(post_loop_head, LoopNode::EntryControl, prev_proj);
-    set_idom(post_loop_head, prev_proj, dom_depth(post_loop_head));
-  }
-}
-
 //------------------------------do_unroll--------------------------------------
 // Unroll the loop body one step - make each trip do 2 iterations.
 void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adjust_min_trip) {

src/hotspot/share/opto/loopnode.cpp

@@ -2150,14 +2150,12 @@ Node* CountedLoopNode::skip_predicates_from_entry(Node* ctrl) {
   }
 
 Node* CountedLoopNode::skip_predicates() {
-  Node* ctrl = in(LoopNode::EntryControl);
   if (is_main_loop()) {
-    ctrl = skip_strip_mined()->in(LoopNode::EntryControl);
-  }
-  if (is_main_loop() || is_post_loop()) {
+    Node* ctrl = skip_strip_mined()->in(LoopNode::EntryControl);
+
     return skip_predicates_from_entry(ctrl);
   }
-  return ctrl;
+  return in(LoopNode::EntryControl);
 }
 
 
@@ -5353,45 +5351,38 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
   }
   assert(early == legal || legal != C->root(), "bad dominance of inputs");
 
-  if (least != early) {
-    // Move the node above predicates as far up as possible so a
-    // following pass of loop predication doesn't hoist a predicate
-    // that depends on it above that node.
-    Node* new_ctrl = least;
-    for (;;) {
-      if (!new_ctrl->is_Proj()) {
-        break;
-      }
-      CallStaticJavaNode* call = new_ctrl->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none);
-      if (call == NULL) {
-        break;
-      }
-      int req = call->uncommon_trap_request();
-      Deoptimization::DeoptReason trap_reason = Deoptimization::trap_request_reason(req);
-      if (trap_reason != Deoptimization::Reason_loop_limit_check &&
-          trap_reason != Deoptimization::Reason_predicate &&
-          trap_reason != Deoptimization::Reason_profile_predicate) {
-        break;
-      }
-      Node* c = new_ctrl->in(0)->in(0);
-      if (is_dominator(c, early) && c != early) {
-        break;
-      }
-      new_ctrl = c;
-    }
-    least = new_ctrl;
-  }
   // Try not to place code on a loop entry projection
   // which can inhibit range check elimination.
   if (least != early) {
     Node* ctrl_out = least->unique_ctrl_out();
     if (ctrl_out && ctrl_out->is_Loop() &&
-        least == ctrl_out->in(LoopNode::EntryControl) &&
-        (ctrl_out->is_CountedLoop() || ctrl_out->is_OuterStripMinedLoop())) {
-      Node* least_dom = idom(least);
-      if (get_loop(least_dom)->is_member(get_loop(least))) {
-        least = least_dom;
+        least == ctrl_out->in(LoopNode::EntryControl)) {
+      // Move the node above predicates as far up as possible so a
+      // following pass of loop predication doesn't hoist a predicate
+      // that depends on it above that node.
+      Node* new_ctrl = least;
+      for (;;) {
+        if (!new_ctrl->is_Proj()) {
+          break;
+        }
+        CallStaticJavaNode* call = new_ctrl->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none);
+        if (call == NULL) {
+          break;
+        }
+        int req = call->uncommon_trap_request();
+        Deoptimization::DeoptReason trap_reason = Deoptimization::trap_request_reason(req);
+        if (trap_reason != Deoptimization::Reason_loop_limit_check &&
+            trap_reason != Deoptimization::Reason_predicate &&
+            trap_reason != Deoptimization::Reason_profile_predicate) {
+          break;
+        }
+        Node* c = new_ctrl->in(0)->in(0);
+        if (is_dominator(c, early) && c != early) {
+          break;
+        }
+        new_ctrl = c;
       }
+      least = new_ctrl;
     }
   }
 

src/hotspot/share/opto/loopnode.hpp

@@ -915,13 +915,13 @@ private:
   void copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_head, Node* init, Node* stride, IdealLoopTree* outer_loop, LoopNode* outer_main_head,
                                              uint dd_main_head, const uint idx_before_pre_post, const uint idx_after_post_before_pre,
                                              Node* zero_trip_guard_proj_main, Node* zero_trip_guard_proj_post, const Node_List &old_new);
-  Node* clone_skeleton_predicate_for_main_or_post_loop(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj, Node* control,
-                                                       IdealLoopTree* outer_loop, Node* input_proj);
-  Node* clone_skeleton_predicate_bool(Node* iff, Node* new_init, Node* new_stride, Node* control);
+  Node* clone_skeleton_predicate_for_main_loop(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj, Node* control,
+                                               IdealLoopTree* outer_loop, Node* input_proj);
+  Node* clone_skeleton_predicate_bool(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj, Node* control,
+                                      IdealLoopTree* outer_loop);
   static bool skeleton_predicate_has_opaque(IfNode* iff);
   static void get_skeleton_predicates(Node* predicate, Unique_Node_List& list, bool get_opaque = false);
   void update_main_loop_skeleton_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init, int stride_con);
-  void copy_skeleton_predicates_to_post_loop(LoopNode* main_loop_head, CountedLoopNode* post_loop_head, Node* init, Node* stride);
   void insert_loop_limit_check(ProjNode* limit_check_proj, Node* cmp_limit, Node* bol);
 #ifdef ASSERT
   bool only_has_infinite_loops();
@@ -1244,9 +1244,9 @@ public:
   void insert_pre_post_loops( IdealLoopTree *loop, Node_List &old_new, bool peel_only );
 
   // Add post loop after the given loop.
-  Node *insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
-                         CountedLoopNode* main_head, CountedLoopEndNode* main_end,
-                         Node*& incr, Node* limit, CountedLoopNode*& post_head);
+  Node *insert_post_loop(IdealLoopTree *loop, Node_List &old_new,
+                         CountedLoopNode *main_head, CountedLoopEndNode *main_end,
+                         Node *incr, Node *limit, CountedLoopNode *&post_head);
 
   // Add an RCE'd post loop which we will multi-version adapt for run time test path usage
   void insert_scalar_rced_post_loop( IdealLoopTree *loop, Node_List &old_new );
@@ -1579,9 +1579,8 @@ private:
                                                Node_List* old_new = NULL);
   void clone_skeleton_predicates_to_unswitched_loop(IdealLoopTree* loop, const Node_List& old_new, Deoptimization::DeoptReason reason,
                                                     ProjNode* old_predicate_proj, ProjNode* iffast_pred, ProjNode* ifslow_pred);
-  ProjNode* clone_skeleton_predicate_for_unswitched_loops(Node* iff, ProjNode* predicate,
-                                                          Deoptimization::DeoptReason reason,
-                                                          ProjNode* output_proj);
+  ProjNode* clone_skeleton_predicate_for_unswitched_loops(Node* iff, ProjNode* predicate, Node* uncommon_proj, Deoptimization::DeoptReason reason,
+                                                          ProjNode* output_proj, IdealLoopTree* loop);
   static void check_created_predicate_for_unswitching(const Node* new_entry) PRODUCT_RETURN;
 
   bool _created_loop_node;

src/hotspot/share/opto/macro.cpp

@@ -2562,7 +2562,6 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
         assert(n->Opcode() == Op_LoopLimit ||
                n->Opcode() == Op_Opaque2   ||
                n->Opcode() == Op_Opaque3   ||
-               n->Opcode() == Op_Opaque4   ||
                BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(n),
                "unknown node type in macro list");
       }
@@ -2624,19 +2623,6 @@ bool PhaseMacroExpand::expand_macro_nodes() {
         _igvn.replace_node(n, repl);
         success = true;
 #endif
-      } else if (n->Opcode() == Op_Opaque4) {
-        // With Opaque4 nodes, the expectation is that the test of input 1
-        // is always equal to the constant value of input 2. So we can
-        // remove the Opaque4 and replace it by input 2. In debug builds,
-        // leave the non constant test in instead to sanity check that it
-        // never fails (if it does, that subgraph was constructed so, at
-        // runtime, a Halt node is executed).
-#ifdef ASSERT
-        _igvn.replace_node(n, n->in(1));
-#else
-        _igvn.replace_node(n, n->in(2));
-#endif
-        success = true;
       } else if (n->Opcode() == Op_OuterStripMinedLoop) {
         n->as_OuterStripMinedLoop()->adjust_strip_mined_loop(&_igvn);
         C->remove_macro_node(n);

src/hotspot/share/opto/opaquenode.cpp

@@ -60,6 +60,25 @@ bool Opaque2Node::cmp( const Node &n ) const {
   return (&n == this);          // Always fail except on self
 }
 
+Node* Opaque4Node::Identity(PhaseGVN* phase) {
+  if (phase->C->post_loop_opts_phase()) {
+    // With Opaque4 nodes, the expectation is that the test of input 1
+    // is always equal to the constant value of input 2. So we can
+    // remove the Opaque4 and replace it by input 2. In debug builds,
+    // leave the non constant test in instead to sanity check that it
+    // never fails (if it does, that subgraph was constructed so, at
+    // runtime, a Halt node is executed).
+#ifdef ASSERT
+    return this->in(1);
+#else
+    return this->in(2);
+#endif
+  } else {
+    phase->C->record_for_post_loop_opts_igvn(this);
+  }
+  return this;
+}
+
 const Type* Opaque4Node::Value(PhaseGVN* phase) const {
   return phase->type(in(1));
 }

src/hotspot/share/opto/opaquenode.hpp

@@ -114,13 +114,11 @@ class Opaque3Node : public Opaque2Node {
 // GraphKit::must_be_not_null().
 class Opaque4Node : public Node {
   public:
-  Opaque4Node(Compile* C, Node *tst, Node* final_tst) : Node(NULL, tst, final_tst) {
-    init_flags(Flag_is_macro);
-    C->add_macro_node(this);
-  }
+  Opaque4Node(Compile* C, Node *tst, Node* final_tst) : Node(NULL, tst, final_tst) {}
 
   virtual int Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::BOOL; }
+  virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 

src/hotspot/share/opto/split_if.cpp

@@ -200,24 +200,6 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) {
       return true;
     }
   }
-  if (n->Opcode() == Op_OpaqueLoopStride || n->Opcode() == Op_OpaqueLoopInit) {
-    Unique_Node_List wq;
-    wq.push(n);
-    for (uint i = 0; i < wq.size(); i++) {
-      Node* m = wq.at(i);
-      if (m->is_If()) {
-        assert(skeleton_predicate_has_opaque(m->as_If()), "opaque node not reachable from if?");
-        Node* bol = clone_skeleton_predicate_bool(m, NULL, NULL, m->in(0));
-        _igvn.replace_input_of(m, 1, bol);
-      } else {
-        assert(!m->is_CFG(), "not CFG expected");
-        for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
-          Node* u = m->fast_out(j);
-          wq.push(u);
-        }
-      }
-    }
-  }
 
   // See if splitting-up a Store.  Any anti-dep loads must go up as
   // well.  An anti-dep load might be in the wrong block, because in

src/hotspot/share/runtime/abstract_vm_version.cpp

@@ -117,7 +117,7 @@ const char* Abstract_VM_Version::vm_vendor() {
 #ifdef VENDOR
   return VENDOR;
 #else
-  return "JetBrains s.r.o.";
+  return "Oracle Corporation";
 #endif
 }
 

src/hotspot/share/runtime/arguments.cpp

@@ -1337,7 +1337,6 @@ bool Arguments::add_property(const char* prop, PropertyWriteable writeable, Prop
     log_info(cds)("optimized module handling: disabled due to incompatible property: %s=%s", key, value);
   }
   if (strcmp(key, "jdk.module.showModuleResolution") == 0 ||
-      strcmp(key, "jdk.module.illegalAccess") == 0 ||
       strcmp(key, "jdk.module.validation") == 0 ||
       strcmp(key, "java.system.class.loader") == 0) {
     MetaspaceShared::disable_full_module_graph();
@@ -2132,8 +2131,7 @@ bool Arguments::parse_uintx(const char* value,
 }
 
 bool Arguments::create_module_property(const char* prop_name, const char* prop_value, PropertyInternal internal) {
-  assert(is_internal_module_property(prop_name) ||
-         strcmp(prop_name, "jdk.module.illegalAccess") == 0, "unknown module property: '%s'", prop_name);
+  assert(is_internal_module_property(prop_name), "unknown module property: '%s'", prop_name);
   size_t prop_len = strlen(prop_name) + strlen(prop_value) + 2;
   char* property = AllocateHeap(prop_len, mtArguments);
   int ret = jio_snprintf(property, prop_len, "%s=%s", prop_name, prop_value);
@@ -2501,11 +2499,10 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
       if (res != JNI_OK) {
         return res;
       }
-    } else if (match_option(option, "--jbr-illegal-access", &tail)) {
-      warning("Option --jbr-illegal-access is deprecated and will be removed in a future release.");
-      if (!create_module_property("jdk.module.illegalAccess", "permit", ExternalProperty)) {
-        return JNI_ENOMEM;
-      }
+    } else if (match_option(option, "--illegal-access=", &tail)) {
+      char version[256];
+      JDK_Version::jdk(17).to_string(version, sizeof(version));
+      warning("Ignoring option %s; support was removed in %s", option->optionString, version);
     // -agentlib and -agentpath
     } else if (match_option(option, "-agentlib:", &tail) ||
           (is_absolute_path = match_option(option, "-agentpath:", &tail))) {

src/java.base/share/classes/com/jetbrains/internal/JBRApi.java

@@ -16,8 +16,6 @@
 
 package com.jetbrains.internal;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -105,10 +103,9 @@ public class JBRApi {
         JBRApi.outerLookup = outerLookup;
         try {
             Class<?> metadataClass = outerLookup.findClass("com.jetbrains.JBR$Metadata");
-            Lookup lookup = MethodHandles.privateLookupIn(metadataClass, outerLookup);
-            knownServices = Set.of((String[]) lookup.findStaticVarHandle(metadataClass,
+            knownServices = Set.of((String[]) outerLookup.findStaticVarHandle(metadataClass,
                     "KNOWN_SERVICES", String[].class).get());
-            knownProxies = Set.of((String[]) lookup.findStaticVarHandle(metadataClass,
+            knownProxies = Set.of((String[]) outerLookup.findStaticVarHandle(metadataClass,
                     "KNOWN_PROXIES", String[].class).get());
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
@@ -159,52 +156,13 @@ public class JBRApi {
         RegisteredProxyInfo info = registeredProxyInfoByTargetName.get(targetName);
         if (info == null) return null;
         try {
-            return (info.type().isPublicApi() ? outerLookup : info.apiModule())
+            return (info.type() == ProxyInfo.Type.CLIENT_PROXY ? info.apiModule() : outerLookup)
                     .findClass(info.interfaceName());
         } catch (ClassNotFoundException | IllegalAccessException e) {
             return null;
         }
     }
 
-    public static InternalServiceBuilder internalServiceBuilder(Lookup interFace, String target) {
-        return new InternalServiceBuilder(new RegisteredProxyInfo(
-                interFace, interFace.lookupClass().getName(), target, ProxyInfo.Type.INTERNAL_SERVICE, new ArrayList<>()));
-    }
-
-    public static class InternalServiceBuilder {
-
-        private final RegisteredProxyInfo info;
-
-        private InternalServiceBuilder(RegisteredProxyInfo info) {
-            this.info = info;
-        }
-
-        public InternalServiceBuilder withStatic(String methodName, String clazz) {
-            return withStatic(methodName, clazz, methodName);
-        }
-
-        public InternalServiceBuilder withStatic(String interfaceMethodName, String clazz, String methodName) {
-            info.staticMethods().add(
-                    new RegisteredProxyInfo.StaticMethodMapping(interfaceMethodName, clazz, methodName));
-            return this;
-        }
-
-        public Object build() {
-            ProxyInfo info = ProxyInfo.resolve(this.info);
-            if (info == null) return null;
-            ProxyGenerator generator = new ProxyGenerator(info);
-            if (!generator.areAllMethodsImplemented()) return null;
-            generator.defineClasses();
-            MethodHandle constructor = generator.findConstructor();
-            generator.init();
-            try {
-                return constructor.invoke();
-            } catch (Throwable e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
     /**
      * Called by {@linkplain com.jetbrains.bootstrap.JBRApiBootstrap#MODULES registry classes}
      * to register a new mapping for corresponding modules.

src/java.base/share/classes/com/jetbrains/internal/ProxyGenerator.java

@@ -78,7 +78,7 @@ class ProxyGenerator {
      */
     ProxyGenerator(ProxyInfo info) {
         this.info = info;
-        generateBridge = info.type.isPublicApi();
+        generateBridge = info.type != ProxyInfo.Type.CLIENT_PROXY;
         int nameId = nameCounter.getAndIncrement();
         proxyName = Type.getInternalName(info.interFace) + "$$JBRApiProxy$" + nameId;
         bridgeName = generateBridge ? info.apiModule.lookupClass().getPackageName().replace('.', '/') + "/" +
@@ -153,7 +153,7 @@ class ProxyGenerator {
             } else {
                 MethodHandle c = generatedProxy.findConstructor(generatedProxy.lookupClass(),
                         MethodType.methodType(void.class, Object.class));
-                if (info.type.isService()) {
+                if (info.type == ProxyInfo.Type.SERVICE) {
                     try {
                         return MethodHandles.foldArguments(c, info.target.findConstructor(info.target.lookupClass(),
                                 MethodType.methodType(void.class)).asType(MethodType.methodType(Object.class)));

src/java.base/share/classes/com/jetbrains/internal/ProxyInfo.java

@@ -66,7 +66,7 @@ class ProxyInfo {
     }
 
     Lookup getInterfaceLookup() {
-        return type == Type.CLIENT_PROXY || type == Type.INTERNAL_SERVICE ? apiModule : JBRApi.outerLookup;
+        return type == Type.CLIENT_PROXY ? apiModule : JBRApi.outerLookup;
     }
 
     Lookup getTargetLookup() {
@@ -74,18 +74,12 @@ class ProxyInfo {
     }
 
     private Lookup lookup(Lookup lookup, String clazz) {
-        String[] nestedClasses = clazz.split("\\$");
-        clazz = "";
-        for (int i = 0; i < nestedClasses.length; i++) {
-            try {
-                if (i != 0) clazz += "$";
-                clazz += nestedClasses[i];
-                lookup = MethodHandles.privateLookupIn(lookup.findClass(clazz), lookup);
-            } catch (ClassNotFoundException | IllegalAccessException ignore) {
-                return null;
-            }
+        try {
+            return MethodHandles.privateLookupIn(lookup.findClass(clazz), lookup);
+        } catch (ClassNotFoundException | IllegalAccessException e) {
+            if (lookup == JBRApi.outerLookup) return null;
+            else throw new RuntimeException(e);
         }
-        return lookup;
     }
 
     record StaticMethodMapping(Lookup lookup, String methodName) {}
@@ -96,15 +90,6 @@ class ProxyInfo {
     enum Type {
         PROXY,
         SERVICE,
-        CLIENT_PROXY,
-        INTERNAL_SERVICE;
-
-        public boolean isPublicApi() {
-            return this == PROXY || this == SERVICE;
-        }
-
-        public boolean isService() {
-            return this == SERVICE || this == INTERNAL_SERVICE;
-        }
+        CLIENT_PROXY
     }
 }

src/java.base/share/classes/jdk/internal/module/ExplodedSystemModules.java

@@ -68,14 +68,4 @@ class ExplodedSystemModules implements SystemModules {
     public Map<String, Set<String>> moduleReads() {
         throw new InternalError();
     }
-
-    @Override
-    public  Map<String, Set<String>> concealedPackagesToOpen() {
-        return Map.of();
-    }
-
-    @Override
-    public  Map<String, Set<String>> exportedPackagesToOpen() {
-        return Map.of();
-    }
 }

src/java.base/share/classes/jdk/internal/module/IllegalAccessMaps.java

@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.internal.module;
-
-import sun.nio.cs.UTF_8;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UncheckedIOException;
-import java.lang.module.ModuleDescriptor;
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Generates the maps of concealed and exported packages to open at run-time.
- *
- * This is used at run-time for exploded builds, and at link-time to generate
- * the maps for the system modules in the run-time image.
- */
-
-public class IllegalAccessMaps {
-    private final Map<String, Set<String>> concealedPackagesToOpen;
-    private final Map<String, Set<String>> exportedPackagesToOpen;
-
-    private IllegalAccessMaps(Map<String, Set<String>> map1,
-                              Map<String, Set<String>> map2) {
-        this.concealedPackagesToOpen = map1;
-        this.exportedPackagesToOpen = map2;
-    }
-
-    /**
-     * Returns the map of concealed packages to open. The map key is the
-     * module name, the value is the set of concealed packages to open.
-     */
-    public Map<String, Set<String>> concealedPackagesToOpen() {
-        return concealedPackagesToOpen;
-    }
-
-    /**
-     * Returns the map of exported packages to open. The map key is the
-     * module name, the value is the set of exported packages to open.
-     */
-    public Map<String, Set<String>> exportedPackagesToOpen() {
-        return exportedPackagesToOpen;
-    }
-
-    /**
-     * Generate the maps of module to concealed and exported packages for
-     * the system modules that are observable with the given module finder.
-     */
-    public static IllegalAccessMaps generate(ModuleFinder finder) {
-        Map<String, ModuleDescriptor> map = new HashMap<>();
-        finder.findAll().stream()
-            .map(ModuleReference::descriptor)
-            .forEach(md -> md.packages().forEach(pn -> map.putIfAbsent(pn, md)));
-
-        Map<String, Set<String>> concealedPackagesToOpen = new HashMap<>();
-        Map<String, Set<String>> exportedPackagesToOpen = new HashMap<>();
-
-        String rn = "jdk8_packages.dat";
-        InputStream in = IllegalAccessMaps.class.getResourceAsStream(rn);
-        if (in == null) {
-            throw new InternalError(rn + " not found");
-        }
-        try (BufferedReader br = new BufferedReader(
-                new InputStreamReader(in, UTF_8.INSTANCE)))
-        {
-            br.lines()
-                .filter(line -> !line.isEmpty() && !line.startsWith("#"))
-                .forEach(pn -> {
-                    ModuleDescriptor descriptor = map.get(pn);
-                    if (descriptor != null && !isOpen(descriptor, pn)) {
-                        String name = descriptor.name();
-                        if (isExported(descriptor, pn)) {
-                            exportedPackagesToOpen.computeIfAbsent(name,
-                                    k -> new HashSet<>()).add(pn);
-                        } else {
-                            concealedPackagesToOpen.computeIfAbsent(name,
-                                    k -> new HashSet<>()).add(pn);
-                        }
-                    }
-                });
-
-        } catch (IOException ioe) {
-            throw new UncheckedIOException(ioe);
-        }
-
-        return new IllegalAccessMaps(concealedPackagesToOpen, exportedPackagesToOpen);
-    }
-
-    private static boolean isExported(ModuleDescriptor descriptor, String pn) {
-        return descriptor.exports()
-                .stream()
-                .anyMatch(e -> e.source().equals(pn) && !e.isQualified());
-    }
-
-    private static boolean isOpen(ModuleDescriptor descriptor, String pn) {
-        return descriptor.opens()
-                .stream()
-                .anyMatch(e -> e.source().equals(pn) && !e.isQualified());
-    }
-}

src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java

@@ -147,8 +147,7 @@ public final class ModuleBootstrap {
                getProperty("jdk.module.limitmods") == null &&     // --limit-modules
                getProperty("jdk.module.addreads.0") == null &&    // --add-reads
                getProperty("jdk.module.addexports.0") == null &&  // --add-exports
-               getProperty("jdk.module.addopens.0") == null &&    // --add-opens
-               getProperty("jdk.module.illegalAccess") == null;   // --jbr-illegal-access
+               getProperty("jdk.module.addopens.0") == null;      // --add-opens
     }
 
     /**
@@ -189,7 +188,6 @@ public final class ModuleBootstrap {
         String mainModule = System.getProperty("jdk.module.main");
         Set<String> addModules = addModules();
         Set<String> limitModules = limitModules();
-        String illegalAccess = getAndRemoveProperty("jdk.module.illegalAccess");
 
         PrintStream traceOutput = null;
         String trace = getAndRemoveProperty("jdk.module.showModuleResolution");
@@ -221,8 +219,7 @@ public final class ModuleBootstrap {
                 && !haveModulePath
                 && addModules.isEmpty()
                 && limitModules.isEmpty()
-                && !isPatched
-                && illegalAccess == null) {
+                && !isPatched) {
             systemModuleFinder = archivedModuleGraph.finder();
             hasSplitPackages = archivedModuleGraph.hasSplitPackages();
             hasIncubatorModules = archivedModuleGraph.hasIncubatorModules();
@@ -457,19 +454,10 @@ public final class ModuleBootstrap {
             checkIncubatingStatus(cf);
         }
 
-        // --add-reads, --add-exports/--add-opens, and --jbr-illegal-access
+        // --add-reads, --add-exports/--add-opens
         addExtraReads(bootLayer);
         boolean extraExportsOrOpens = addExtraExportsAndOpens(bootLayer);
 
-        if (illegalAccess != null) {
-            assert systemModules != null;
-            addIllegalAccess(illegalAccess,
-                             systemModules,
-                             upgradeModulePath,
-                             bootLayer,
-                             extraExportsOrOpens);
-        }
-
         // add enable native access
         addEnableNativeAccess(bootLayer);
 
@@ -825,74 +813,6 @@ public final class ModuleBootstrap {
         return modules;
     }
 
-    /**
-     * Process the --jbr-illegal-access option to open packages of system modules
-     * in the boot layer to code in unnamed modules.
-     */
-    private static void addIllegalAccess(String illegalAccess,
-                                         SystemModules systemModules,
-                                         ModuleFinder upgradeModulePath,
-                                         ModuleLayer bootLayer,
-                                         boolean extraExportsOrOpens) {
-
-        Map<String, Set<String>> concealedPackagesToOpen = systemModules.concealedPackagesToOpen();
-        Map<String, Set<String>> exportedPackagesToOpen = systemModules.exportedPackagesToOpen();
-        if (concealedPackagesToOpen.isEmpty() && exportedPackagesToOpen.isEmpty()) {
-            // need to generate (exploded build)
-            IllegalAccessMaps maps = IllegalAccessMaps.generate(limitedFinder());
-            concealedPackagesToOpen = maps.concealedPackagesToOpen();
-            exportedPackagesToOpen = maps.exportedPackagesToOpen();
-        }
-
-        // open specific packages in the system modules
-        Set<String> emptySet = Set.of();
-        for (Module m : bootLayer.modules()) {
-            ModuleDescriptor descriptor = m.getDescriptor();
-            String name = m.getName();
-
-            // skip open modules
-            if (descriptor.isOpen()) {
-                continue;
-            }
-
-            // skip modules loaded from the upgrade module path
-            if (upgradeModulePath != null
-                && upgradeModulePath.find(name).isPresent()) {
-                continue;
-            }
-
-            Set<String> concealedPackages = concealedPackagesToOpen.getOrDefault(name, emptySet);
-            Set<String> exportedPackages = exportedPackagesToOpen.getOrDefault(name, emptySet);
-
-            // refresh the set of concealed and exported packages if needed
-            if (extraExportsOrOpens) {
-                concealedPackages = new HashSet<>(concealedPackages);
-                exportedPackages = new HashSet<>(exportedPackages);
-                Iterator<String> iterator = concealedPackages.iterator();
-                while (iterator.hasNext()) {
-                    String pn = iterator.next();
-                    if (m.isExported(pn, BootLoader.getUnnamedModule())) {
-                        // concealed package is exported to ALL-UNNAMED
-                        iterator.remove();
-                        exportedPackages.add(pn);
-                    }
-                }
-                iterator = exportedPackages.iterator();
-                while (iterator.hasNext()) {
-                    String pn = iterator.next();
-                    if (m.isOpen(pn, BootLoader.getUnnamedModule())) {
-                        // exported package is opened to ALL-UNNAMED
-                        iterator.remove();
-                    }
-                }
-            }
-
-            // open the packages to unnamed modules
-            JLA.addOpensToAllUnnamed(m, concealedPackages, exportedPackages);
-        }
-
-    }
-
     /**
      * Decodes the values of --add-reads, -add-exports, --add-opens or
      * --patch-modules options that are encoded in system properties.

src/java.base/share/classes/jdk/internal/module/SystemModules.java

@@ -83,16 +83,4 @@ interface SystemModules {
      * by this SystemModules object.
      */
     Map<String, Set<String>> moduleReads();
-
-    /**
-     * Returns the map of module concealed packages to open. The map key is the
-     * module name, the value is the set of concealed packages to open.
-     */
-    Map<String, Set<String>> concealedPackagesToOpen();
-
-    /**
-     * Returns the map of module exported packages to open. The map key is the
-     * module name, the value is the set of exported packages to open.
-     */
-    Map<String, Set<String>> exportedPackagesToOpen();
 }

src/java.base/share/classes/sun/launcher/resources/launcher.properties

@@ -188,10 +188,6 @@ java.launcher.X.usage=\n\
 \    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n\
 \                      updates <module> to open <package> to\n\
 \                      <target-module>, regardless of module declaration.\n\
-\    --jbr-illegal-access\n\
-\                      permit access to members of types in named modules\n\
-\                      by code in unnamed modules.\n\
-\                      This option will be removed in a future release.\n\
 \    --limit-modules <module name>[,<module name>...]\n\
 \                      limit the universe of observable modules\n\
 \    --patch-module <module>=<file>({0}<file>)*\n\

src/java.desktop/macosx/classes/sun/font/CStrike.java

@@ -249,13 +249,6 @@ public final class CStrike extends PhysicalStrike {
         }
     }
 
-    int getSlot0GlyphImagePtrs(int[] glyphCodes, long[] images, int len) {
-        int ourGlyphs = 0;
-        while (ourGlyphs < len && (glyphCodes[ourGlyphs] & CompositeGlyphMapper.SLOTMASK) == 0) ourGlyphs++;
-        getGlyphImagePtrs(glyphCodes, images, ourGlyphs);
-        return ourGlyphs;
-    }
-
     // called from the Sun2D renderer
     void getGlyphImagePtrs(int[] glyphCodes, long[] images, int len) {
         synchronized (glyphInfoCache) {

src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java

@@ -38,10 +38,11 @@ import java.beans.PropertyChangeListener;
 import java.lang.annotation.Native;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.security.PrivilegedAction;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.Arrays;
@@ -75,18 +76,24 @@ import sun.lwawt.LWWindowPeer;
 @SuppressWarnings("removal")
 class CAccessibility implements PropertyChangeListener {
     private static Set<String> ignoredRoles;
+    private static final int INVOKE_TIMEOUT_SECONDS_DEFAULT = 1;
     private static final int INVOKE_TIMEOUT_SECONDS;
 
     static {
-        // (-1) for the infinite timeout
-        @SuppressWarnings("removal")
-        int value = java.security.AccessController.doPrivileged(
-            (PrivilegedAction<Integer>) () -> {
-                // Need to load the native library for this code.
-                System.loadLibrary("awt");
-                return Integer.getInteger("sun.lwawt.macosx.CAccessibility.invokeTimeoutSeconds", 1);
+        AtomicInteger invokeTimeoutSecondsRef = new AtomicInteger();
+        // Need to load the native library for this code.
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    invokeTimeoutSecondsRef.set(
+                            // (-1) for the infinite timeout
+                            Integer.getInteger("sun.lwawt.macosx.CAccessibility.invokeTimeoutSeconds",
+                                    INVOKE_TIMEOUT_SECONDS_DEFAULT));
+                    return null;
+                }
             });
-        INVOKE_TIMEOUT_SECONDS = value;
+        INVOKE_TIMEOUT_SECONDS = invokeTimeoutSecondsRef.get();
     }
 
     static CAccessibility sAccessibility;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -66,7 +66,6 @@ import sun.awt.AWTAccessor.ComponentAccessor;
 import sun.awt.AWTAccessor.WindowAccessor;
 import sun.awt.AWTThreading;
 import sun.java2d.SurfaceData;
-import sun.lwawt.LWComponentPeer;
 import sun.lwawt.LWLightweightFramePeer;
 import sun.lwawt.LWToolkit;
 import sun.lwawt.LWWindowPeer;
@@ -291,7 +290,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         new Property<CPlatformWindow>(WINDOW_TRANSPARENT_TITLE_BAR_HEIGHT) {
             public void applyProperty(final CPlatformWindow c, final Object value) {
                 if (value != null && (value instanceof Float)) {
-                    c.execute(ptr -> AWTThreading.executeWaitToolkit(wait -> nativeSetTransparentTitleBarHeight(ptr, (float) value)));
+                    c.execute(ptr -> nativeSetTransparentTitleBarHeight(ptr, (float) value));
                 }
             }
         }
@@ -1457,20 +1456,28 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         isFullScreenAnimationOn = false;
     }
 
-    // JBR API internals
-    private static void setCustomDecorationTitleBarHeight(Window target, ComponentPeer peer, float height) {
-        if (peer instanceof LWComponentPeer) {
-            PlatformWindow platformWindow = ((LWComponentPeer<?, ?>) peer).getPlatformWindow();
-            if (platformWindow instanceof CPlatformWindow) {
-                ((CPlatformWindow) platformWindow).execute(ptr -> {
-                    AWTThreading.executeWaitToolkit(wait -> nativeSetTransparentTitleBarHeight(ptr, height));
-                });
-                if (target instanceof javax.swing.RootPaneContainer) {
-                    final javax.swing.JRootPane rootpane = ((javax.swing.RootPaneContainer)target).getRootPane();
-                    if (rootpane != null) rootpane.putClientProperty(WINDOW_TRANSPARENT_TITLE_BAR_HEIGHT, height);
-                }
-            }
+    // called from client via reflection
+    private void setTransparentTitleBarHeight(float height) {
+        execute(ptr -> {
+            nativeSetTransparentTitleBarHeight(ptr, height);
+        });
+    }
+
+    private volatile List<Rectangle> customDecorHitTestSpots;
+
+    // called from client via reflection
+    private void setCustomDecorationHitTestSpots(List<Rectangle> hitTestSpots) {
+        this.customDecorHitTestSpots = new CopyOnWriteArrayList<>(hitTestSpots);
+    }
+
+    // called from native
+    private boolean hitTestCustomDecoration(float x, float y) {
+        List<Rectangle> spots = customDecorHitTestSpots;
+        if (spots == null) return false;
+        for (Rectangle spot : spots) {
+            if (spot.contains(x, y)) return true;
         }
+        return false;
     }
 
 }

src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -89,7 +89,6 @@ import java.net.URL;
 import java.security.*;
 import java.util.*;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -676,12 +675,30 @@ public final class LWCToolkit extends LWToolkit {
         return invokeAndWait(callable, component, -1);
     }
 
-    public static <T> T invokeAndWait(final Callable<T> callable, Component component, int timeoutSeconds) throws Exception {
+    static <T> T invokeAndWait(final Callable<T> callable, Component component, int timeoutSeconds) throws Exception {
         final CallableWrapper<T> wrapper = new CallableWrapper<>(callable);
         invokeAndWait(wrapper, component, false, timeoutSeconds);
         return wrapper.getResult();
     }
 
+    static final class CancelableRunnable implements Runnable {
+        volatile Runnable runnable;
+
+        public CancelableRunnable(Runnable runnable) {
+            this.runnable = runnable;
+        }
+
+        @Override
+        public void run() {
+            Runnable r = runnable;
+            if (r != null) r.run();
+        }
+
+        public void cancel() {
+            runnable = null;
+        }
+    }
+
     static final class CallableWrapper<T> implements Runnable {
         final Callable<T> callable;
         T object;
@@ -759,7 +776,7 @@ public final class LWCToolkit extends LWToolkit {
         invokeAndWait(runnable, component, false, -1);
     }
 
-    public static void invokeAndWait(Runnable runnable, Component component, boolean processEvents, int timeoutSeconds)
+    static void invokeAndWait(Runnable runnable, Component component, boolean processEvents, int timeoutSeconds)
             throws InvocationTargetException
     {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
@@ -767,17 +784,24 @@ public final class LWCToolkit extends LWToolkit {
         }
 
         boolean nonBlockingRunLoop;
+        CancelableRunnable cancelableRunnable = new CancelableRunnable(runnable);
 
         synchronized (priorityInvocationPending) {
             nonBlockingRunLoop = priorityInvocationPending.get();
             if (!nonBlockingRunLoop) blockingRunLoopCounter.incrementAndGet();
         }
 
-        AWTThreading.TrackedInvocationEvent invocationEvent =
-            AWTThreading.createAndTrackInvocationEvent(component, runnable, true);
+        final long mediator = createAWTRunLoopMediator();
 
-        long mediator = createAWTRunLoopMediator();
-        invocationEvent.onDone(() -> stopAWTRunLoop(mediator));
+        InvocationEvent invocationEvent =
+                AWTThreading.createAndTrackInvocationEvent(component,
+                        cancelableRunnable,
+                        () -> {
+                            if (mediator != 0) {
+                                stopAWTRunLoop(mediator);
+                            }
+                        },
+                        true);
 
         if (component != null) {
             AppContext appContext = SunToolkit.targetToAppContext(component);
@@ -791,21 +815,10 @@ public final class LWCToolkit extends LWToolkit {
             ((LWCToolkit)Toolkit.getDefaultToolkit()).getSystemEventQueueForInvokeAndWait().postEvent(invocationEvent);
         }
 
-        CompletableFuture<Void> eventDispatchThreadFreeFuture =
-            AWTThreading.getInstance(component).onEventDispatchThreadFree(() -> {
-                if (!invocationEvent.isDone()) {
-                    // EventQueue is now empty but the posted InvocationEvent is still not dispatched,
-                    // consider it lost then.
-                    invocationEvent.dispose("InvocationEvent was lost");
-                }
-            });
-
-        invocationEvent.onDone(() -> eventDispatchThreadFreeFuture.cancel(false));
-
         if (!doAWTRunLoop(mediator, nonBlockingRunLoop, timeoutSeconds)) {
-            invocationEvent.dispose("InvocationEvent has timed out");
+            new Throwable("Invocation timed out (" + timeoutSeconds + "sec)").printStackTrace();
+            cancelableRunnable.cancel();
         }
-
         if (!nonBlockingRunLoop) blockingRunLoopCounter.decrementAndGet();
 
         if (log.isLoggable(PlatformLogger.Level.FINE)) {

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

@@ -50,10 +50,6 @@
     NSWindowTabbingMode javaWindowTabbingMode;
     BOOL isEnterFullScreen;
     CGFloat _transparentTitleBarHeight;
-    id<NSObject> _windowWillEnterFullScreenNotification;
-    id<NSObject> _windowWillExitFullScreenNotification;
-    id<NSObject> _windowDidExitFullScreenNotification;
-    NSMutableArray* _transparentTitleBarConstraints;
     NSLayoutConstraint *_transparentTitleBarHeightConstraint;
     NSMutableArray *_transparentTitleBarButtonCenterXConstraints;
 }

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

@@ -26,7 +26,6 @@
 #include <objc/objc-runtime.h>
 #import <Cocoa/Cocoa.h>
 
-#include <java_awt_Window_CustomWindowDecoration.h>
 #import "sun_lwawt_macosx_CPlatformWindow.h"
 #import "com_apple_eawt_event_GestureHandler.h"
 #import "com_apple_eawt_FullScreenHandler.h"
@@ -1010,7 +1009,7 @@ AWT_ASSERT_APPKIT_THREAD;
 #ifdef DEBUG
     NSLog(@"resigned key: %d %@ %@", [self.nsWindow isMainWindow], [self.nsWindow title], [self menuBarForWindow]);
 #endif
-    if (![self.nsWindow isMainWindow] || [NSApp keyWindow] == self.nsWindow) {
+    if (![self.nsWindow isMainWindow]) {
         [self deactivateWindow];
     }
 }
@@ -1039,9 +1038,7 @@ AWT_ASSERT_APPKIT_THREAD;
     NSWindow *keyWindow = [NSApp keyWindow];
     AWTWindow *opposite = nil;
     if ([AWTWindow isAWTWindow: keyWindow]) {
-        if (keyWindow != self.nsWindow) {
-            opposite = (AWTWindow *)[keyWindow delegate];
-        }
+        opposite = (AWTWindow *)[keyWindow delegate];
         [AWTWindow setLastKeyWindow: self];
     } else {
         [AWTWindow setLastKeyWindow: nil];
@@ -1297,10 +1294,10 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     NSView* titlebarContainer = titlebar.superview;
     NSView* themeFrame = titlebarContainer.superview;
 
-    _transparentTitleBarConstraints = [[NSMutableArray alloc] init];
+    NSMutableArray* newConstraints = [[NSMutableArray alloc] init];
     titlebarContainer.translatesAutoresizingMaskIntoConstraints = NO;
     _transparentTitleBarHeightConstraint = [titlebarContainer.heightAnchor constraintEqualToConstant:_transparentTitleBarHeight];
-    [_transparentTitleBarConstraints addObjectsFromArray:@[
+    [newConstraints addObjectsFromArray:@[
         [titlebarContainer.leftAnchor constraintEqualToAnchor:themeFrame.leftAnchor],
         [titlebarContainer.widthAnchor constraintEqualToAnchor:themeFrame.widthAnchor],
         [titlebarContainer.topAnchor constraintEqualToAnchor:themeFrame.topAnchor],
@@ -1313,7 +1310,7 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     for (NSView* view in @[titlebar, windowDragView])
     {
         view.translatesAutoresizingMaskIntoConstraints = NO;
-        [_transparentTitleBarConstraints addObjectsFromArray:@[
+        [newConstraints addObjectsFromArray:@[
             [view.leftAnchor constraintEqualToAnchor:titlebarContainer.leftAnchor],
             [view.rightAnchor constraintEqualToAnchor:titlebarContainer.rightAnchor],
             [view.topAnchor constraintEqualToAnchor:titlebarContainer.topAnchor],
@@ -1329,7 +1326,7 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
         button.translatesAutoresizingMaskIntoConstraints = NO;
         NSLayoutConstraint* buttonCenterXConstraint = [button.centerXAnchor constraintEqualToAnchor:titlebarContainer.leftAnchor constant:(_transparentTitleBarHeight/2.0 + (index * horizontalButtonOffset))];
         [_transparentTitleBarButtonCenterXConstraints addObject:buttonCenterXConstraint];
-        [_transparentTitleBarConstraints addObjectsFromArray:@[
+        [newConstraints addObjectsFromArray:@[
             [button.widthAnchor constraintLessThanOrEqualToAnchor:titlebarContainer.heightAnchor multiplier:0.5],
             // Those corrections are required to keep the icons perfectly round because macOS adds a constant 2 px in resulting height to their frame
             [button.heightAnchor constraintEqualToAnchor: button.widthAnchor multiplier:14.0/12.0 constant:-2.0],
@@ -1338,7 +1335,7 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
         ]];
     }];
 
-    [NSLayoutConstraint activateConstraints:_transparentTitleBarConstraints];
+    [NSLayoutConstraint activateConstraints:newConstraints];
 }
 
 - (void) updateTransparentTitleBarConstraints
@@ -1364,22 +1361,20 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     NSView* titlebarContainer = titlebar.superview;
     NSView* themeFrame = titlebarContainer.superview;
 
-    [NSLayoutConstraint deactivateConstraints:_transparentTitleBarConstraints];
-
     AWTWindowDragView* windowDragView;
     for (NSView* view in titlebar.subviews) {
         if ([view isMemberOfClass:[AWTWindowDragView class]]) {
             windowDragView = view;
         }
         if (view.translatesAutoresizingMaskIntoConstraints == NO) {
+            [view removeConstraints:view.constraints];
             view.translatesAutoresizingMaskIntoConstraints = YES;
         }
     }
     [windowDragView removeFromSuperview];
+    [titlebarContainer removeConstraints:titlebarContainer.constraints];
     titlebarContainer.translatesAutoresizingMaskIntoConstraints = YES;
-    titlebar.translatesAutoresizingMaskIntoConstraints = YES;
 
-    _transparentTitleBarConstraints = nil;
     _transparentTitleBarHeightConstraint = nil;
     _transparentTitleBarButtonCenterXConstraints = nil;
 }
@@ -1408,44 +1403,23 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     });
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
     NSOperationQueue* mainQueue = [NSOperationQueue mainQueue];
-    _windowWillEnterFullScreenNotification = [defaultCenter addObserverForName:NSWindowWillEnterFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
+    [defaultCenter addObserverForName:NSWindowWillEnterFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
         [self resetTitleBar];
     }];
-    _windowWillExitFullScreenNotification = [defaultCenter addObserverForName:NSWindowWillExitFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
+    [defaultCenter addObserverForName:NSWindowWillExitFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
         [self setWindowControlsHidden:YES];
     }];
-    _windowDidExitFullScreenNotification = [defaultCenter addObserverForName:NSWindowDidExitFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
+    [defaultCenter addObserverForName:NSWindowDidExitFullScreenNotification object:self.nsWindow queue:mainQueue usingBlock:^(NSNotification* notification) {
         [self setUpTransparentTitleBar];
         [self setWindowControlsHidden:NO];
     }];
 }
 
-- (void) configureWindowAndListenersForDefaultTitleBar
-{
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        [self.nsWindow setTitlebarAppearsTransparent:NO];
-        [self.nsWindow setTitleVisibility:NSWindowTitleVisible];
-        [self.nsWindow setStyleMask:[self.nsWindow styleMask]&(~NSWindowStyleMaskFullSizeContentView)];
-
-        if (!self.isFullScreen) {
-            [self resetTitleBar];
-        }
-    });
-    NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
-    [defaultCenter removeObserver:_windowWillEnterFullScreenNotification];
-    [defaultCenter removeObserver:_windowWillExitFullScreenNotification];
-    [defaultCenter removeObserver:_windowDidExitFullScreenNotification];
-    _windowWillEnterFullScreenNotification = _windowWillExitFullScreenNotification = _windowDidExitFullScreenNotification = nil;
-}
-
 - (void) setTransparentTitleBarHeight: (CGFloat) transparentTitleBarHeight
 {
-    if (_transparentTitleBarHeight == transparentTitleBarHeight) return;
     if (_transparentTitleBarHeight != 0.0f) {
         _transparentTitleBarHeight = transparentTitleBarHeight;
-        if (transparentTitleBarHeight == 0.0f) {
-            [self configureWindowAndListenersForDefaultTitleBar];
-        } else if (_transparentTitleBarHeightConstraint != nil || _transparentTitleBarButtonCenterXConstraints != nil) {
+        if (_transparentTitleBarHeightConstraint != nil || _transparentTitleBarButtonCenterXConstraints != nil) {
             [self updateTransparentTitleBarConstraints];
         }
     } else {
@@ -1481,18 +1455,11 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     jobject platformWindow = (*env)->NewLocalRef(env, self.javaPlatformWindow);
     if (platformWindow != NULL) {
         GET_CPLATFORM_WINDOW_CLASS_RETURN(YES);
-        DECLARE_FIELD_RETURN(jf_target, jc_CPlatformWindow, "target", "Ljava/awt/Window;", YES);
-        DECLARE_CLASS_RETURN(jc_Window, "java/awt/Window", YES);
-        DECLARE_METHOD_RETURN(jm_hitTestCustomDecoration, jc_Window, "hitTestCustomDecoration", "(II)I", YES);
-        jobject awtWindow = (*env)->GetObjectField(env, platformWindow, jf_target);
-        if (awtWindow != NULL) {
-            NSRect frame = [self.window frame];
-            float windowHeight = frame.size.height;
-            returnValue = (*env)->CallIntMethod(env, awtWindow, jm_hitTestCustomDecoration, (jint) point.x,  (jint) (windowHeight - point.y)) ==
-                                  (jint) java_awt_Window_CustomWindowDecoration_NO_HIT_SPOT ? YES : NO;
-            CHECK_EXCEPTION();
-            (*env)->DeleteLocalRef(env, awtWindow);
-        }
+        DECLARE_METHOD_RETURN(jm_hitTestCustomDecoration, jc_CPlatformWindow, "hitTestCustomDecoration", "(FF)Z", YES);
+        NSRect frame = [self.window frame];
+        float windowHeight = frame.size.height;
+        returnValue = (*env)->CallBooleanMethod(env, platformWindow, jm_hitTestCustomDecoration, point.x,  windowHeight - point.y) == JNI_TRUE ? NO : YES;
+        CHECK_EXCEPTION_IN_ENV(env);
         (*env)->DeleteLocalRef(env, platformWindow);
     }
     return returnValue;

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

@@ -161,8 +161,8 @@ void initializeActions() {
     [sActions setObject:NSAccessibilityPressAction forKey:@"click"];
     [sActions setObject:NSAccessibilityIncrementAction forKey:@"increment"];
     [sActions setObject:NSAccessibilityDecrementAction forKey:@"decrement"];
-    [sActions setObject:NSAccessibilityShowMenuAction forKey:@"toggle popup"];
-    [sActions setObject:NSAccessibilityPressAction forKey:@"toggleexpand"];
+    [sActions setObject:NSAccessibilityShowMenuAction forKey:@"togglePopup"];
+    [sActions setObject:NSAccessibilityPressAction forKey:@"toggleExpand"];
 
     sActionSelectors = [[NSMutableDictionary alloc] initWithCapacity:actionsCount];
 

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

@@ -632,8 +632,6 @@ JNI_COCOA_ENTER(env);
 
     AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
 
-    if (mediatorObject == nil) return;
-
     [ThreadUtilities performOnMainThread:@selector(endRunLoop) on:mediatorObject withObject:nil waitUntilDone:NO];
 
     [mediatorObject release];

src/java.desktop/share/classes/com/jetbrains/desktop/JBRApiModule.java

@@ -30,7 +30,6 @@ public class JBRApiModule {
                     .withStatic("getSubpixelResolution", "sun.font.FontUtilities")
                 .service("com.jetbrains.JBRFileDialogService", null)
                     .withStatic("getFileDialog", "com.jetbrains.desktop.JBRFileDialog", "get")
-                .proxy("com.jetbrains.JBRFileDialog", "com.jetbrains.desktop.JBRFileDialog")
-                .service("com.jetbrains.CustomWindowDecoration", "java.awt.Window$CustomWindowDecoration");
+                .proxy("com.jetbrains.JBRFileDialog", "com.jetbrains.desktop.JBRFileDialog");
     }
 }

src/java.desktop/share/classes/java/awt/EventQueue.java

@@ -358,7 +358,6 @@ public class EventQueue {
             if (shouldNotify) {
                 if (theEvent.getSource() != AWTAutoShutdown.getInstance()) {
                     AWTAutoShutdown.getInstance().notifyThreadBusy(dispatchThread);
-                    AWTThreading.getInstance(dispatchThread).notifyEventDispatchThreadBusy();
                 }
                 pushPopCond.signalAll();
             } else if (notifyID) {
@@ -571,7 +570,6 @@ public class EventQueue {
                     return event;
                 }
                 AWTAutoShutdown.getInstance().notifyThreadFree(dispatchThread);
-                AWTThreading.getInstance(dispatchThread).notifyEventDispatchThreadFree();
                 pushPopCond.await();
             } finally {
                 pushPopLock.unlock();
@@ -1130,7 +1128,6 @@ public class EventQueue {
                             t.setPriority(Thread.NORM_PRIORITY + 1);
                             t.setDaemon(false);
                             AWTAutoShutdown.getInstance().notifyThreadBusy(t);
-                            AWTThreading.getInstance(t).notifyEventDispatchThreadBusy();
                             return t;
                         }
                     }
@@ -1161,7 +1158,6 @@ public class EventQueue {
                 dispatchThread = null;
             }
             AWTAutoShutdown.getInstance().notifyThreadFree(edt);
-            AWTThreading.getInstance(edt).notifyEventDispatchThreadFree();
             /*
              * Event was posted after EDT events pumping had stopped, so start
              * another EDT to handle this event

src/java.desktop/share/classes/java/awt/Window.java

@@ -46,17 +46,13 @@ import java.io.ObjectOutputStream;
 import java.io.OptionalDataException;
 import java.io.Serial;
 import java.io.Serializable;
-import java.lang.annotation.Native;
-import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EventListener;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.Vector;
@@ -68,7 +64,6 @@ import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
-import com.jetbrains.internal.JBRApi;
 import sun.awt.AWTAccessor;
 import sun.awt.AWTPermissions;
 import sun.awt.AppContext;
@@ -4012,66 +4007,7 @@ public class Window extends Container implements Accessible {
     }
 
     private volatile boolean hasCustomDecoration;
-    private volatile List<Map.Entry<Shape, Integer>> customDecorHitTestSpots;
-    private volatile int customDecorTitleBarHeight = -1; // 0 can be a legal value when no title bar is expected
 
-    // called from native
-    private int hitTestCustomDecoration(int x, int y) {
-        var spots = customDecorHitTestSpots;
-        if (spots == null) return CustomWindowDecoration.NO_HIT_SPOT;
-        for (var spot : spots) {
-            if (spot.getKey().contains(x, y)) return spot.getValue();
-        }
-        return CustomWindowDecoration.NO_HIT_SPOT;
-    }
-
-    private static class CustomWindowDecoration {
-
-        @Native public static final int
-                NO_HIT_SPOT = 0,
-                OTHER_HIT_SPOT = 1,
-                MINIMIZE_BUTTON = 2,
-                MAXIMIZE_BUTTON = 3,
-                CLOSE_BUTTON = 4,
-                MENU_BAR = 5;
-
-        void setCustomDecorationEnabled(Window window, boolean enabled) {
-            window.hasCustomDecoration = enabled;
-            if (MacOS.INSTANCE != null && window.customDecorTitleBarHeight > 0f) {
-                MacOS.INSTANCE.setTitleBarHeight(window, window.peer, enabled ? window.customDecorTitleBarHeight : 0);
-            }
-        }
-        boolean isCustomDecorationEnabled(Window window) {
-            return window.hasCustomDecoration;
-        }
-
-        void setCustomDecorationHitTestSpots(Window window, List<Map.Entry<Shape, Integer>> spots) {
-            window.customDecorHitTestSpots = List.copyOf(spots);
-        }
-        List<Map.Entry<Shape, Integer>> getCustomDecorationHitTestSpots(Window window) {
-            return window.customDecorHitTestSpots;
-        }
-
-        void setCustomDecorationTitleBarHeight(Window window, int height) {
-            if (height >= 0) {
-                window.customDecorTitleBarHeight = height;
-                if (MacOS.INSTANCE != null && window.hasCustomDecoration) {
-                    MacOS.INSTANCE.setTitleBarHeight(window, window.peer, height);
-                }
-            }
-        }
-        int getCustomDecorationTitleBarHeight(Window window) {
-            return window.customDecorTitleBarHeight;
-        }
-
-        private interface MacOS {
-            MacOS INSTANCE = (MacOS) JBRApi.internalServiceBuilder(MethodHandles.lookup(), null)
-                    .withStatic("setTitleBarHeight", "sun.lwawt.macosx.CPlatformWindow", "setCustomDecorationTitleBarHeight").build();
-            void setTitleBarHeight(Window target, ComponentPeer peer, float height);
-        }
-    }
-
-    @Deprecated
     boolean hasCustomDecoration() {
         return hasCustomDecoration;
     }
@@ -4079,7 +4015,6 @@ public class Window extends Container implements Accessible {
     /**
      * Set via reflection (JB JdkEx API).
      */
-    @Deprecated
     void setHasCustomDecoration() {
         hasCustomDecoration = true;
     }

src/java.desktop/share/classes/sun/awt/AWTThreading.java

@@ -8,27 +8,15 @@ import java.awt.event.InvocationEvent;
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.*;
-import java.util.List;
+import java.util.Map;
+import java.util.Stack;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
 
 /**
  * Used to perform a cross threads (EventDispatch, Toolkit) execution so that the execution does not cause a deadlock.
- *
- * Note: the log messages are tested by jdk/jb/java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java
  */
 public class AWTThreading {
-    private static final PlatformLogger logger = PlatformLogger.getLogger(AWTThreading.class.getName());
-
-    private static final Runnable EMPTY_RUNNABLE = () -> {};
-
-    private static final AtomicReference<Function<Thread, AWTThreading>> theAWTThreadingFactory =
-            new AtomicReference<>(AWTThreading::new);
-
-    private final Thread eventDispatchThread;
+    private static final PlatformLogger logger = PlatformLogger.getLogger("sun.awt.AWTThreading");
 
     private ExecutorService executor;
     // every invokeAndWait() pushes a queue of invocations
@@ -36,21 +24,13 @@ public class AWTThreading {
 
     private int level; // re-entrance level
 
-    private final List<CompletableFuture<Void>> eventDispatchThreadStateNotifiers = new ArrayList<>();
-    private volatile boolean isEventDispatchThreadFree;
-
     // invocations should be dispatched on proper EDT (per AppContext)
     private static final Map<Thread, AWTThreading> EDT_TO_INSTANCE_MAP = new ConcurrentHashMap<>();
 
     @SuppressWarnings("serial")
     private static class TrackingQueue extends LinkedBlockingQueue<InvocationEvent> {}
 
-    /**
-     * WARNING: for testing purpose, use {@link AWTThreading#getInstance(Thread)} instead.
-     */
-    public AWTThreading(Thread edt) {
-        eventDispatchThread = edt;
-    }
+    private AWTThreading() {}
 
     /**
      * Executes a callable from EventDispatch thread (EDT). It's assumed the callable either performs a blocking execution on Toolkit
@@ -198,15 +178,8 @@ public class AWTThreading {
      * <li>If the event is first dispatched from EventQueue - it gets removed from the tracking queue.
      * <li>If the event is first dispatched from the tracking queue - its dispatching on EventQueue will be noop.
      * <ul>
-     *
-     * @param source the source of the event
-     * @param onDispatched called back on event dispatching
-     * @param catchThrowables should catch Throwable's or propagate to the EventDispatch thread's loop
      */
-    public static TrackedInvocationEvent createAndTrackInvocationEvent(Object source,
-                                                                       Runnable onDispatched,
-                                                                       boolean catchThrowables)
-    {
+    public static InvocationEvent createAndTrackInvocationEvent(Object source, Runnable runnable, Runnable listener, boolean catchThrowables) {
         AWTThreading instance = getInstance(source);
         if (instance != null) {
             synchronized (instance.invocations) {
@@ -214,204 +187,65 @@ public class AWTThreading {
                     instance.invocations.push(new TrackingQueue());
                 }
                 final TrackingQueue queue = instance.invocations.peek();
-                final AtomicReference<TrackedInvocationEvent> eventRef = new AtomicReference<>();
+                final InvocationEvent[] eventRef = new InvocationEvent[1];
 
-                eventRef.set(TrackedInvocationEvent.create(
-                    source,
-                    onDispatched,
-                    new Runnable() {
-                        final WeakReference<TrackingQueue> queueRef = new WeakReference<>(queue);
+                queue.add(eventRef[0] = new InvocationEvent(
+                        source,
+                        runnable,
+                        // Wrap the original completion listener so that it:
+                        // - guarantees a single run either from dispatch or dispose
+                        // - removes the invocation event from the tracking queue
+                        new Runnable() {
+                            WeakReference<TrackingQueue> queueRef = new WeakReference<>(queue);
 
-                        @Override
-                        public void run() {
-                            TrackingQueue queue = queueRef.get();
-                            queueRef.clear();
-                            if (queue != null) {
-                                queue.remove(eventRef.get());
+                            @Override
+                            public void run() {
+                                if (queueRef != null) {
+                                    if (listener != null) {
+                                        listener.run();
+                                    }
+                                    TrackingQueue q = queueRef.get();
+                                    if (q != null) {
+                                        q.remove(eventRef[0]);
+                                    }
+                                    queueRef = null;
+                                }
                             }
+                        },
+                        catchThrowables)
+                {
+                    @Override
+                    public void dispatch() {
+                        if (!isDispatched()) {
+                            super.dispatch();
                         }
-                    },
-                    catchThrowables));
-
-                queue.add(eventRef.get());
-                return eventRef.get();
+                    }
+                });
+                return eventRef[0];
             }
         }
-        return TrackedInvocationEvent.create(source, onDispatched, () -> {}, catchThrowables);
+        return new InvocationEvent(source, runnable, listener, catchThrowables);
     }
 
-    @SuppressWarnings("serial")
-    public static class TrackedInvocationEvent extends InvocationEvent {
-        private final long creationTime = System.currentTimeMillis();
-        private final Throwable throwable = new Throwable();
-        private final CompletableFuture<Void> futureResult = new CompletableFuture<>();
-
-        // dispatched or disposed
-        private final AtomicBoolean isFinished = new AtomicBoolean(false);
-
-        static TrackedInvocationEvent create(Object source,
-                                             Runnable onDispatch,
-                                             Runnable onDone,
-                                             boolean catchThrowables)
-        {
-            final AtomicReference<TrackedInvocationEvent> eventRef = new AtomicReference<>();
-            eventRef.set(new TrackedInvocationEvent(
-                source,
-                onDispatch,
-                () -> {
-                    if (onDone != null) {
-                        onDone.run();
-                    }
-                    TrackedInvocationEvent thisEvent = eventRef.get();
-                    if (!thisEvent.isDispatched()) {
-                        // If we're here - this {onDone} is being disposed.
-                        thisEvent.finishIfNotYet(() ->
-                            // If we're here - this {onDone} is called by the outer AWTAccessor.getInvocationEventAccessor().dispose()
-                            // which we do not control, so complete here.
-                            thisEvent.futureResult.completeExceptionally(new Throwable("InvocationEvent was disposed"))
-                        );
-                    }
-                },
-                catchThrowables));
-            return eventRef.get();
-        }
-
-        protected TrackedInvocationEvent(Object source, Runnable onDispatched, Runnable onDone, boolean catchThrowables) {
-            super(source,
-                  Optional.of(onDispatched).orElse(EMPTY_RUNNABLE),
-                  Optional.of(onDone).orElse(EMPTY_RUNNABLE),
-                  catchThrowables);
-
-            futureResult.whenComplete((r, ex) -> {
-                if (ex != null) {
-                    String message = ex.getMessage() + " (awaiting " + (System.currentTimeMillis() - creationTime) + " ms)";
-                    if (logger.isLoggable(PlatformLogger.Level.FINE)) {
-                        ex.initCause(throwable);
-                        logger.fine(message, ex);
-                    } else if (logger.isLoggable(PlatformLogger.Level.INFO)) {
-                        StackTraceElement[] stack = throwable.getStackTrace();
-                        logger.info(message + ". Originated at " + stack[stack.length - 1]);
-                    }
-                }
-            });
-        }
-
-        @Override
-        public void dispatch() {
-            finishIfNotYet(super::dispatch);
-            futureResult.complete(null);
-        }
-
-        public void dispose(String reason) {
-            finishIfNotYet(() -> AWTAccessor.getInvocationEventAccessor().dispose(this));
-            futureResult.completeExceptionally(new Throwable(reason));
-        }
-
-        private void finishIfNotYet(Runnable finish) {
-            if (!isFinished.getAndSet(true)) {
-                finish.run();
-            }
-        }
-
-        /**
-         * Returns whether the event is dispatched or disposed.
-         */
-        public boolean isDone() {
-            return futureResult.isDone();
-        }
-
-        /**
-         * Calls the runnable when it's done (immediately if it's done).
-         */
-        public void onDone(Runnable runnable) {
-            futureResult.whenComplete((r, ex) -> Optional.of(runnable).orElse(EMPTY_RUNNABLE).run());
-        }
-    }
-
-    public static AWTThreading getInstance(Object obj) {
-        if (obj == null) {
-            return getInstance(Toolkit.getDefaultToolkit().getSystemEventQueue());
-        }
+    private static AWTThreading getInstance(Object obj) {
+        if (obj == null) return null;
 
         AppContext appContext = SunToolkit.targetToAppContext(obj);
-        if (appContext == null) {
-            return getInstance(Toolkit.getDefaultToolkit().getSystemEventQueue());
-        }
+        if (appContext == null) return null;
 
         return getInstance((EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY));
     }
 
-    public static AWTThreading getInstance(EventQueue eq) {
+    private static AWTThreading getInstance(EventQueue eq) {
         if (eq == null) return null;
 
         return getInstance(AWTAccessor.getEventQueueAccessor().getDispatchThread(eq));
     }
 
-    public static AWTThreading getInstance(Thread edt) {
-        assert edt != null;
+    private static AWTThreading getInstance(Thread edt) {
+        if (edt == null) return null;
 
-        return EDT_TO_INSTANCE_MAP.computeIfAbsent(edt, key -> theAWTThreadingFactory.get().apply(edt));
-    }
-
-    public Thread getEventDispatchThread() {
-        return eventDispatchThread;
-    }
-
-    /**
-     * Sets {@code AWTThreading} instance factory.
-     * WARNING: for testing purpose.
-     */
-    public static void setAWTThreadingFactory(Function<Thread, AWTThreading> factory) {
-        theAWTThreadingFactory.set(factory);
-    }
-
-    public void notifyEventDispatchThreadFree() {
-        List<CompletableFuture<Void>> notifiers = Collections.emptyList();
-        synchronized (eventDispatchThreadStateNotifiers) {
-            isEventDispatchThreadFree = true;
-            if (eventDispatchThreadStateNotifiers.size() > 0) {
-                notifiers = List.copyOf(eventDispatchThreadStateNotifiers);
-            }
-        }
-        if (logger.isLoggable(PlatformLogger.Level.FINER)) {
-            logger.finer("notifyEventDispatchThreadFree");
-        }
-        // notify callbacks out of the synchronization block
-        notifiers.forEach(f -> f.complete(null));
-    }
-
-    public void notifyEventDispatchThreadBusy() {
-        synchronized (eventDispatchThreadStateNotifiers) {
-            isEventDispatchThreadFree = false;
-        }
-        if (logger.isLoggable(PlatformLogger.Level.FINER)) {
-            logger.finer("notifyEventDispatchThreadBusy");
-        }
-    }
-
-    /**
-     * Sets a callback and returns a {@code CompletableFuture} reporting the case when the associated EventDispatch thread
-     * has gone sleeping and stopped dispatching events because of empty EventQueue. If the EventDispatch thread is free
-     * at the moment then the callback is called immediately on the caller's thread and the future completes.
-     */
-    public CompletableFuture<Void> onEventDispatchThreadFree(Runnable runnable) {
-        CompletableFuture<Void> future = new CompletableFuture<>();
-        future.thenRun(Optional.of(runnable).orElse(EMPTY_RUNNABLE));
-
-        if (!isEventDispatchThreadFree) {
-            synchronized (eventDispatchThreadStateNotifiers) {
-                if (!isEventDispatchThreadFree) {
-                    eventDispatchThreadStateNotifiers.add(future);
-                    future.whenComplete((r, ex) -> eventDispatchThreadStateNotifiers.remove(future));
-                    return future;
-                }
-            }
-        }
-        if (logger.isLoggable(PlatformLogger.Level.FINER)) {
-            logger.finer("onEventDispatchThreadFree: free at the moment");
-        }
-        future.complete(null);
-        return future;
+        return EDT_TO_INSTANCE_MAP.computeIfAbsent(edt, key -> new AWTThreading());
     }
 
     public interface Task {

src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c

@@ -37,9 +37,7 @@
 #include "sizecalc.h"
 #include <jni_util.h>
 #include <stdio.h>
-#include <math.h>
 #include "awt.h"
-#include "debug_assert.h"
 
 static void *gtk3_libhandle = NULL;
 static void *gthread_libhandle = NULL;
@@ -2913,12 +2911,8 @@ static void transform_detail_string (const gchar *detail,
     }
 }
 
-inline static int scale_down_to_plus_inf(int what, int scale) {
-    return (int)ceilf(what / (float)scale);
-}
-
-inline static int scale_down_to_minus_inf(int what, int scale) {
-    return (int)floorf(what / (float)scale);
+inline static int scale_down(int what, int scale) {
+    return (int)(what / (float)scale + 0.5f);
 }
 
 static gboolean gtk3_get_drawable_data(JNIEnv *env, jintArray pixelArray,
@@ -2927,29 +2921,15 @@ static gboolean gtk3_get_drawable_data(JNIEnv *env, jintArray pixelArray,
     GdkPixbuf *pixbuf;
     jint *ary;
 
-    int skip_left = 0;
-    int skip_top = 0;
     GdkWindow *root = (*fp_gdk_get_default_root_window)();
     if (gtk3_version_3_10) {
         int win_scale = (*fp_gdk_window_get_scale_factor)(root);
-
-        // Scale the coordinate and size carefully such that the captured area
-        // is at least as large as requested. We trim off excess later by
-        // using the skip_* variables.
-        const int x_scaled = scale_down_to_minus_inf(x, win_scale);
-        const int y_scaled = scale_down_to_minus_inf(y, win_scale);
-        skip_left = x - x_scaled*win_scale;
-        skip_top  = y - y_scaled*win_scale;
-        DASSERT(skip_left >= 0 && skip_top >= 0);
-
-        const int x_right_scaled = scale_down_to_plus_inf(x + width, win_scale);
-        const int width_scaled = x_right_scaled - x_scaled;
-        DASSERT(width_scaled > 0);
-
-        const int y_bottom_scaled = scale_down_to_plus_inf(y + height, win_scale);
-        const int height_scaled = y_bottom_scaled - y_scaled;
-        DASSERT(height_scaled > 0);
-
+        // Scale the size up to, but never below, 1. This is for the case when a single-pixel
+        // image is required. Besides, Gtk API doesn't allow the size to be less than one.
+        const int width_scaled = (width <= win_scale) ? 1 : scale_down(width, win_scale);
+        const int height_scaled = (height <= win_scale) ? 1 : scale_down(height, win_scale);
+        const int x_scaled = scale_down(x, win_scale);
+        const int y_scaled = scale_down(y, win_scale);
         pixbuf = (*fp_gdk_pixbuf_get_from_drawable)(
             root, x_scaled, y_scaled, width_scaled, height_scaled);
     } else {
@@ -2986,8 +2966,7 @@ static gboolean gtk3_get_drawable_data(JNIEnv *env, jintArray pixelArray,
                 int index;
                 for (_y = 0; _y < height; _y++) {
                     for (_x = 0; _x < width; _x++) {
-                        p = pix + (intptr_t) (_y + skip_top) * stride
-                                + (_x + skip_left) * nchan;
+                        p = pix + (intptr_t) _y * stride + _x * nchan;
 
                         index = (_y + dy) * jwidth + (_x + dx);
                         ary[index] = 0xff000000

src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java

@@ -55,11 +55,8 @@ import java.awt.image.DataBufferInt;
 import java.awt.peer.WindowPeer;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import sun.awt.AWTAccessor;
@@ -994,29 +991,31 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
         return err;
     }
 
+    private volatile List<Rectangle> customDecorHitTestSpots;
+    private volatile int customDecorTitleBarHeight = -1; // 0 can be a legal value when no title bar is expected
+
     // called from client via reflection
-    @Deprecated
     private void setCustomDecorationHitTestSpots(List<Rectangle> hitTestSpots) {
-        List<Map.Entry<Shape, Integer>> spots = new ArrayList<>();
-        for (Rectangle spot : hitTestSpots) spots.add(Map.entry(spot, 1));
-        try {
-            Field f = Window.class.getDeclaredField("customDecorHitTestSpots");
-            f.setAccessible(true);
-            f.set(target, spots);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new Error(e);
-        }
+        this.customDecorHitTestSpots = new CopyOnWriteArrayList<>(hitTestSpots);
     }
 
     // called from client via reflection
-    @Deprecated
     private void setCustomDecorationTitleBarHeight(int height) {
-        try {
-            Field f = Window.class.getDeclaredField("customDecorTitleBarHeight");
-            f.setAccessible(true);
-            f.set(target, height);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new Error(e);
+        if (height >= 0) customDecorTitleBarHeight = height;
+    }
+
+    // called from native
+    private boolean hitTestCustomDecoration(int x, int y) {
+        List<Rectangle> spots = customDecorHitTestSpots;
+        if (spots == null) return false;
+        for (Rectangle spot : spots) {
+            if (spot.contains(x, y)) return true;
         }
+        return false;
+    }
+
+    // called from native
+    private int getCustomDecorationTitleBarHeight() {
+        return customDecorTitleBarHeight;
     }
 }

src/java.desktop/windows/native/libawt/windows/awt_Component.cpp

@@ -1646,9 +1646,6 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
       case WM_NCRBUTTONDOWN:
            mr = WmNcMouseDown(wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), RIGHT_BUTTON);
            break;
-        case WM_NCMOUSEMOVE:
-            mr = WmNcMouseMove(wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
-            break;
       case WM_LBUTTONUP:
           if (ignoreNextLBTNUP) {
               ignoreNextLBTNUP = FALSE;
@@ -2333,9 +2330,6 @@ MsgRouting AwtComponent::WmNcMouseDown(WPARAM hitTest, int x, int y, int button)
 MsgRouting AwtComponent::WmNcMouseUp(WPARAM hitTest, int x, int y, int button) {
     return mrDoDefault;
 }
-MsgRouting AwtComponent::WmNcMouseMove(WPARAM hitTest, int x, int y) {
-    return mrDoDefault;
-}
 
 MsgRouting AwtComponent::WmWindowPosChanging(LPARAM windowPos) {
     return mrDoDefault;

src/java.desktop/windows/native/libawt/windows/awt_Component.h

@@ -525,7 +525,6 @@ public:
                                     int wheelRotation, BOOL isHorizontal);
     virtual MsgRouting WmNcMouseDown(WPARAM hitTest, int x, int y, int button);
     virtual MsgRouting WmNcMouseUp(WPARAM hitTest, int x, int y, int button);
-    virtual MsgRouting WmNcMouseMove(WPARAM hitTest, int x, int y);
     virtual MsgRouting WmWindowPosChanging(LPARAM windowPos);
     virtual MsgRouting WmWindowPosChanged(LPARAM windowPos);
     virtual void WmTouch(WPARAM wParam, LPARAM lParam);

src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp

@@ -37,7 +37,6 @@
 #include <dwmapi.h>
 
 #include <java_lang_Integer.h>
-#include <java_awt_Window_CustomWindowDecoration.h>
 #include <sun_awt_windows_WEmbeddedFrame.h>
 #include <sun_awt_windows_WEmbeddedFramePeer.h>
 
@@ -623,23 +622,6 @@ MsgRouting AwtFrame::WmNcMouseDown(WPARAM hitTest, int x, int y, int button) {
     if (m_grabbedWindow != NULL/* && !m_grabbedWindow->IsOneOfOwnersOf(this)*/) {
         m_grabbedWindow->Ungrab();
     }
-    // For windows with custom decorations, handle caption-related mouse events
-    // Do not handle events from caption itself to preserve native drag behavior
-    if (HasCustomDecoration()) {
-        switch (hitTest) {
-            case HTMINBUTTON:
-            case HTMAXBUTTON:
-            case HTCLOSE:
-            case HTMENU:
-                RECT rcWindow;
-                GetWindowRect(GetHWnd(), &rcWindow);
-                WmMouseDown(GetButtonMK(button),
-                            x - rcWindow.left,
-                            y - rcWindow.top,
-                            button);
-                return mrConsume;
-        }
-    }
     if (!IsFocusableWindow() && (button & LEFT_BUTTON)) {
         switch (hitTest) {
         case HTTOP:
@@ -671,24 +653,6 @@ MsgRouting AwtFrame::WmNcMouseDown(WPARAM hitTest, int x, int y, int button) {
     return AwtWindow::WmNcMouseDown(hitTest, x, y, button);
 }
 
-MsgRouting AwtFrame::WmNcMouseMove(WPARAM hitTest, int x, int y) {
-    // For windows with custom decorations, handle caption-related mouse events
-    if (HasCustomDecoration()) {
-        switch (hitTest) {
-            case HTMINBUTTON:
-            case HTMAXBUTTON:
-            case HTCLOSE:
-            case HTMENU:
-            case HTCAPTION:
-                RECT rcWindow;
-                GetWindowRect(GetHWnd(), &rcWindow);
-                WmMouseMove(0, x - rcWindow.left, y - rcWindow.top);
-                if (hitTest != HTCAPTION) return mrConsume; // Preserve default window drag for HTCAPTION
-        }
-    }
-    return AwtWindow::WmNcMouseMove(hitTest, x, y);
-}
-
 // Override AwtWindow::Reshape() to handle minimized/maximized
 // frames (see 6525850, 4065534)
 void AwtFrame::Reshape(int x, int y, int w, int h)
@@ -1706,7 +1670,7 @@ BOOL AwtFrame::HasCustomDecoration()
     if (!m_pHasCustomDecoration) {
         m_pHasCustomDecoration = new BOOL;
         JNIEnv *env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
-        *m_pHasCustomDecoration = JNU_GetFieldByName(env, NULL, GetTarget(env), "hasCustomDecoration", "Z").z;
+        *m_pHasCustomDecoration = JNU_CallMethodByName(env, NULL, GetTarget(env), "hasCustomDecoration", "()Z").z;
     }
     return *m_pHasCustomDecoration;
 }
@@ -1748,8 +1712,10 @@ LRESULT HitTestNCA(AwtFrame* frame, int x, int y) {
     AdjustWindowRectEx(&rcFrame, WS_OVERLAPPEDWINDOW & ~WS_CAPTION, FALSE, NULL);
 
     JNIEnv *env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
-    int titleHeight = (int)JNU_GetFieldByName(env, NULL, frame->GetTarget(env),
-                                              "customDecorTitleBarHeight", "I").i;
+    int titleHeight = (int)JNU_CallMethodByName(env, NULL, frame->GetPeer(env),
+                                                "getCustomDecorationTitleBarHeight", "()I",
+                                                frame->ScaleDownX(x - rcWindow.left),
+                                                frame->ScaleDownY(y - rcWindow.top)).i;
     if (titleHeight >= 0) {
         titleHeight = frame->ScaleUpY(titleHeight);
         insets.top = titleHeight; // otherwise leave default
@@ -1762,23 +1728,12 @@ LRESULT HitTestNCA(AwtFrame* frame, int x, int y) {
     if (y >= rcWindow.top &&
         y < rcWindow.top + insets.top)
     {
-        jint customSpot = JNU_CallMethodByName(env, NULL, frame->GetTarget(env),
-                                               "hitTestCustomDecoration", "(II)I",
-                                               frame->ScaleDownX(x - rcWindow.left),
-                                               frame->ScaleDownY(y - rcWindow.top)).i;
-        switch (customSpot) {
-            case java_awt_Window_CustomWindowDecoration_NO_HIT_SPOT:
-                break; // Nothing
-            case java_awt_Window_CustomWindowDecoration_MINIMIZE_BUTTON:
-                return HTMINBUTTON;
-            case java_awt_Window_CustomWindowDecoration_MAXIMIZE_BUTTON:
-                return HTMAXBUTTON;
-            case java_awt_Window_CustomWindowDecoration_CLOSE_BUTTON:
-                return HTCLOSE;
-            case java_awt_Window_CustomWindowDecoration_MENU_BAR:
-                return HTMENU;
-            default:
-                return HTNOWHERE;
+        if (JNU_CallMethodByName(env, NULL, frame->GetPeer(env),
+                                 "hitTestCustomDecoration", "(II)Z",
+                                 frame->ScaleDownX(x - rcWindow.left),
+                                 frame->ScaleDownY(y - rcWindow.top)).z)
+        {
+            return HTNOWHERE;
         }
         fOnResizeBorder = (y < (rcWindow.top - rcFrame.top));
         uRow = 0;

src/java.desktop/windows/native/libawt/windows/awt_Frame.h

@@ -111,7 +111,6 @@ public:
     MsgRouting WmMouseMove(UINT flags, int x, int y);
     MsgRouting WmNcMouseDown(WPARAM hitTest, int x, int y, int button);
     MsgRouting WmNcMouseUp(WPARAM hitTest, int x, int y, int button);
-    MsgRouting WmNcMouseMove(WPARAM hitTest, int x, int y);
     MsgRouting WmGetIcon(WPARAM iconType, LRESULT& retVal);
     MsgRouting WmShowWindow(BOOL show, UINT status);
     MsgRouting WmWindowPosChanging(LPARAM windowPos);

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java

@@ -60,7 +60,6 @@ import java.util.stream.Collectors;
 
 import jdk.internal.module.Checks;
 import jdk.internal.module.DefaultRoots;
-import jdk.internal.module.IllegalAccessMaps;
 import jdk.internal.module.Modules;
 import jdk.internal.module.ModuleHashes;
 import jdk.internal.module.ModuleInfo.Attributes;
@@ -622,9 +621,6 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             // generate moduleReads
             genModuleReads(cw, cf);
 
-            // generate concealedPackagesToOpen and exportedPackagesToOpen
-            genXXXPackagesToOpenMethods(cw);
-
             return cw;
         }
 
@@ -855,16 +851,6 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             generate(cw, "moduleReads", map, true);
         }
 
-        /**
-         * Generate concealedPackagesToOpen and exportedPackagesToOpen methods.
-         */
-        private void genXXXPackagesToOpenMethods(ClassWriter cw) {
-            ModuleFinder finder = finderOf(moduleInfos);
-            IllegalAccessMaps maps = IllegalAccessMaps.generate(finder);
-            generate(cw, "concealedPackagesToOpen", maps.concealedPackagesToOpen(), false);
-            generate(cw, "exportedPackagesToOpen", maps.exportedPackagesToOpen(), false);
-        }
-
         /**
          * Generate method to return {@code Map<String, Set<String>>}.
          *

src/jetbrains.api/src/com/jetbrains/CustomWindowDecoration.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2000-2021 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.jetbrains;
-
-import java.awt.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public interface CustomWindowDecoration {
-
-    /*CONST java.awt.Window.*_HIT_SPOT*/
-    /*CONST java.awt.Window.*_BUTTON*/
-    /*CONST java.awt.Window.MENU_BAR*/
-
-    void setCustomDecorationEnabled(Window window, boolean enabled);
-    boolean isCustomDecorationEnabled(Window window);
-
-    void setCustomDecorationHitTestSpots(Window window, List<Map.Entry<Shape, Integer>> spots);
-    List<Map.Entry<Shape, Integer>> getCustomDecorationHitTestSpots(Window window);
-
-    void setCustomDecorationTitleBarHeight(Window window, int height);
-    int getCustomDecorationTitleBarHeight(Window window);
-
-
-    @SuppressWarnings("all")
-    class __Fallback implements CustomWindowDecoration {
-
-        private final Method
-                hasCustomDecoration,
-                setHasCustomDecoration,
-                setCustomDecorationHitTestSpots,
-                setCustomDecorationTitleBarHeight;
-        private final Field peer;
-
-        __Fallback() throws Exception {
-            hasCustomDecoration = Window.class.getDeclaredMethod("hasCustomDecoration");
-            hasCustomDecoration.setAccessible(true);
-            setHasCustomDecoration = Window.class.getDeclaredMethod("setHasCustomDecoration");
-            setHasCustomDecoration.setAccessible(true);
-            Class<?> wpeer = Class.forName("sun.awt.windows.WWindowPeer");
-            setCustomDecorationHitTestSpots = wpeer.getDeclaredMethod("setCustomDecorationHitTestSpots", List.class);
-            setCustomDecorationHitTestSpots.setAccessible(true);
-            setCustomDecorationTitleBarHeight = wpeer.getDeclaredMethod("setCustomDecorationTitleBarHeight", int.class);
-            setCustomDecorationTitleBarHeight.setAccessible(true);
-            peer = Component.class.getDeclaredField("peer");
-            peer.setAccessible(true);
-        }
-
-        @Override
-        public void setCustomDecorationEnabled(Window window, boolean enabled) {
-            if (enabled) {
-                try {
-                    setHasCustomDecoration.invoke(window);
-                } catch (IllegalAccessException | InvocationTargetException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        @Override
-        public boolean isCustomDecorationEnabled(Window window) {
-            try {
-                return (boolean) hasCustomDecoration.invoke(window);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-                return false;
-            }
-        }
-
-        @Override
-        public void setCustomDecorationHitTestSpots(Window window, List<Map.Entry<Shape, Integer>> spots) {
-            List<Rectangle> hitTestSpots = spots.stream().map(e -> e.getKey().getBounds()).collect(Collectors.toList());
-            try {
-                setCustomDecorationHitTestSpots.invoke(peer.get(window), hitTestSpots);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-
-        @Override
-        public List<Map.Entry<Shape, Integer>> getCustomDecorationHitTestSpots(Window window) {
-            return List.of();
-        }
-
-        @Override
-        public void setCustomDecorationTitleBarHeight(Window window, int height) {
-            try {
-                setCustomDecorationTitleBarHeight.invoke(peer.get(window), height);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-
-        @Override
-        public int getCustomDecorationTitleBarHeight(Window window) {
-            return 0;
-        }
-    }
-}

src/jetbrains.api/src/com/jetbrains/JBR.java

@@ -66,15 +66,6 @@ public class JBR {
 
     private JBR() {}
 
-    private static <T> T getService(Class<T> interFace, FallbackSupplier<T> fallback) {
-        T service = getService(interFace);
-        try {
-            return service != null ? service : fallback != null ? fallback.get() : null;
-        } catch (Throwable ignore) {
-            return null;
-        }
-    }
-
     static <T> T getService(Class<T> interFace) {
         return api == null ? null : api.getService(interFace);
     }
@@ -103,11 +94,6 @@ public class JBR {
         <T> T getService(Class<T> interFace);
     }
 
-    @FunctionalInterface
-    private interface FallbackSupplier<T> {
-        T get() throws Throwable;
-    }
-
     // ========================== Generated metadata ==========================
 
     /**

src/jetbrains.api/tools/Gensrc.java

@@ -92,7 +92,7 @@ public class Gensrc {
     }
 
     private static String generate(String content) throws IOException {
-        Pattern pattern = compile("/\\*CONST ((?:[a-zA-Z0-9]+\\.)+)([a-zA-Z0-9_*]+)\\s*\\*/");
+        Pattern pattern = compile("/\\*CONST ((?:[a-zA-Z0-9]+\\.)+)([a-zA-Z0-9_*]+)\s*\\*/");
         for (;;) {
             Matcher matcher = pattern.matcher(content);
             if (!matcher.find()) return content;
@@ -102,23 +102,15 @@ public class Gensrc {
             for (Path module : modules.paths) {
                 Path f = module.resolve("share/classes").resolve(file);
                 if (Files.exists(f)) {
-                    Pattern namePattern = compile(name.replaceAll("\\*", "\\\\w+"));
-                    Pattern statementPattern = compile(
-                            "((?:(?:MODS)  ){2,3})([a-zA-Z0-9]+)  (FIELD(?:, FIELD)*);"
-                                    .replaceAll("MODS", "public|protected|private|static|final")
-                                    .replaceAll("FIELD", "\\\\w+ = [\\\\w\"']+ ")
-                                    .replaceAll("  ", "\\\\s+")
-                                    .replaceAll(" ", "\\\\s*")
-                    );
+                    Pattern namePattern = compile(name.replaceAll("\\*", "[a-zA-Z0-9_]+") + "\s*=");
+                    Pattern statementPattern = compile("((?:(?:public|protected|private|static|final)\s+){2,3})([a-zA-Z0-9]+)\s+([^;]+);");
                     Matcher statementMatcher = statementPattern.matcher(Files.readString(f));
                     while (statementMatcher.find()) {
                         String mods = statementMatcher.group(1);
                         if (!mods.contains("static") || !mods.contains("final")) continue;
                         for (String s : statementMatcher.group(3).split(",")) {
-                            s = s.strip();
-                            String nm = s.substring(0, s.indexOf('=')).strip();
-                            if (!namePattern.matcher(nm).matches()) continue;
-                            statements.add("public static final " + statementMatcher.group(2) + " " + s + ";");
+                            if (!namePattern.matcher(s).find()) continue;
+                            statements.add("public static final " + statementMatcher.group(2) + " " + s.strip() + ";");
                         }
                     }
                     break;
@@ -172,7 +164,7 @@ public class Gensrc {
         }
 
         private static Service[] findPublicServiceInterfaces() {
-            Pattern javadocPattern = Pattern.compile("/\\*\\*((?:.|\n)*?)\\s*\\*/");
+            Pattern javadocPattern = Pattern.compile("/\\*\\*((?:.|\n)*?)(\s|\n)*\\*/");
             return modules.services.stream()
                     .map(fullName -> {
                         if (fullName.indexOf('$') != -1) return null; // Only top level services can be public
@@ -194,8 +186,7 @@ public class Gensrc {
                                 javadocEnd = 0;
                             }
                             return new Service(name, javadoc,
-                                    content.substring(javadocEnd, indexOfDeclaration).contains("@Deprecated"),
-                                    content.contains("__Fallback"));
+                                    content.substring(javadocEnd, indexOfDeclaration).contains("@Deprecated"));
                         } catch (IOException e) {
                             throw new UncheckedIOException(e);
                         }
@@ -206,7 +197,7 @@ public class Gensrc {
         private static String generateMethodsForService(Service service) {
             return """
                     private static class $__Holder {<DEPRECATED>
-                        private static final $ INSTANCE = getService($.class, <FALLBACK>);
+                        private static final $ INSTANCE = api != null ? api.getService($.class) : null;
                     }
                     /**
                      * @return true if current runtime has implementation for all methods in {@link $}
@@ -223,13 +214,12 @@ public class Gensrc {
                         return $__Holder.INSTANCE;
                     }
                     """
-                    .replace("<FALLBACK>", service.hasFallback ? "$.__Fallback::new" : "null")
                     .replaceAll("\\$", service.name)
                     .replace("<JAVADOC>", service.javadoc)
                     .replaceAll("<DEPRECATED>", service.deprecated ? "\n@Deprecated" : "");
         }
 
-        private record Service(String name, String javadoc, boolean deprecated, boolean hasFallback) {}
+        private record Service(String name, String javadoc, boolean deprecated) {}
     }
 
     /**
@@ -250,7 +240,7 @@ public class Gensrc {
         }
 
         private void findInModule(String content) {
-            Pattern servicePattern = compile("(service|proxy|twoWayProxy)\\s*\\(([^)]+)");
+            Pattern servicePattern = compile("(service|proxy|twoWayProxy)\s*\\(([^)]+)");
             Matcher matcher = servicePattern.matcher(content);
             while (matcher.find()) {
                 String type = matcher.group(1);

src/jetbrains.api/version.properties

@@ -6,9 +6,9 @@
 # 2. When only new API is added, or some existing API was @Deprecated - increment MINOR, reset PATCH to 0
 # 3. For major backwards incompatible API changes - increment MAJOR, reset MINOR and PATCH to 0
 
-VERSION = 0.0.4
+VERSION = 0.0.2
 
 # Hash is used to track changes to jetbrains.api, so you would not forget to update version when needed.
 # When you make any changes, "make jbr-api" will fail and ask you to update hash and version number here.
 
-HASH = 74417FA361EA554F9C90873A3FF354
+HASH = 814F29888E5EB6C23DF27B53636E9F94

test/hotspot/jtreg/compiler/loopopts/TestDeadPostLoopBecausePredicate.java

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8275330
- * @summary C2: assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions
- *
- * @run main/othervm -Xmx512m -XX:+UnlockDiagnosticVMOptions -Xcomp -XX:CompileOnly=TestDeadPostLoopBecausePredicate TestDeadPostLoopBecausePredicate
- *
- */
-
-
-public class TestDeadPostLoopBecausePredicate {
-
-    public static final int N = 400;
-
-    public static int iFld=54270;
-    public static int iFld1=-4;
-    public int iFld2=201;
-
-    public int mainTest(String[] strArr1) {
-
-        int i=0, i17=8052, i19=22380, i20=60894, iArr[]=new int[N];
-        init(iArr, 4);
-
-        i = 1;
-        do {
-            for (i17 = 5; i17 < 114; i17++) {
-                switch ((i17 % 7) + 126) {
-                case 126:
-                    for (i19 = 2; i19 > i; i19 -= 3) {
-                        try {
-                            i20 = (iFld2 % TestDeadPostLoopBecausePredicate.iFld1);
-                            i20 = (iArr[i19 - 1] % TestDeadPostLoopBecausePredicate.iFld);
-                            TestDeadPostLoopBecausePredicate.iFld = (TestDeadPostLoopBecausePredicate.iFld1 % iArr[i19]);
-                        } catch (ArithmeticException a_e) {}
-                    }
-                    break;
-                }
-            }
-        } while (++i < 220);
-
-        return i20;
-    }
-
-    public static void init(int[] a, int seed) {
-        for (int j = 0; j < a.length; j++) {
-            a[j] = (j % 2 == 0) ? seed + j : seed - j;
-        }
-    }
-
-    public static void main(String[] strArr) {
-        TestDeadPostLoopBecausePredicate _instance = new TestDeadPostLoopBecausePredicate();
-        for (int i = 0; i < 10; i++ ) {
-            _instance.mainTest(strArr);
-        }
-    }
-}

test/hotspot/jtreg/compiler/loopopts/TestPredicateInputBelowLoopPredicate.java

@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2022, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * bug 8280799
- * @summary С2: assert(false) failed: cyclic dependency prevents range check elimination
- * @run main/othervm -XX:-BackgroundCompilation -XX:-UseCountedLoopSafepoints TestPredicateInputBelowLoopPredicate
- */
-
-public class TestPredicateInputBelowLoopPredicate {
-    private static final Object object = new Object();
-    private static int fieldStop = 100;
-    private static int[] array = new int[200];
-    private static int[] array2 = new int[200];
-    private static int fieldStart = 0;
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 20_000; i++) {
-            test(true);
-            test(false);
-        }
-    }
-
-    private static void test(boolean flag) {
-        if (array == null) {
-        }
-        int start = fieldStart;
-        int i = start;
-        for(;;) {
-            int j;
-            for (j = -10; j < 0; j++) {
-            }
-            int stop = fieldStop;
-             // bound check becomes candidate for predication once
-             // loop above is optimized out
-            array[stop - i + j] = 0;
-
-            // A bunch of stuff to grow loop body size and prevent peeling:
-            array2[0] = 0;
-            array2[1] = 0;
-            array2[2] = 0;
-            array2[3] = 0;
-            array2[4] = 0;
-            array2[5] = 0;
-            array2[6] = 0;
-            array2[7] = 0;
-            array2[8] = 0;
-            array2[9] = 0;
-            array2[10] = 0;
-            array2[11] = 0;
-            array2[12] = 0;
-            array2[13] = 0;
-            array2[14] = 0;
-            array2[15] = 0;
-            array2[16] = 0;
-            array2[17] = 0;
-            array2[18] = 0;
-            array2[19] = 0;
-            array2[20] = 0;
-            array2[21] = 0;
-            array2[22] = 0;
-            array2[23] = 0;
-            array2[24] = 0;
-            array2[25] = 0;
-            array2[26] = 0;
-            array2[27] = 0;
-            array2[28] = 0;
-            array2[29] = 0;
-            array2[30] = 0;
-            array2[31] = 0;
-            array2[32] = 0;
-            array2[33] = 0;
-            array2[34] = 0;
-            array2[35] = 0;
-            array2[36] = 0;
-            array2[37] = 0;
-            array2[38] = 0;
-            array2[39] = 0;
-            array2[40] = 0;
-            array2[41] = 0;
-            array2[42] = 0;
-            array2[43] = 0;
-            array2[44] = 0;
-            array2[45] = 0;
-            array2[46] = 0;
-            array2[47] = 0;
-            array2[48] = 0;
-            array2[49] = 0;
-            array2[50] = 0;
-            array2[51] = 0;
-            array2[52] = 0;
-            array2[53] = 0;
-            array2[54] = 0;
-            array2[55] = 0;
-            array2[56] = 0;
-            array2[57] = 0;
-            array2[58] = 0;
-            array2[59] = 0;
-            array2[60] = 0;
-            array2[61] = 0;
-            array2[62] = 0;
-            array2[63] = 0;
-            array2[64] = 0;
-            array2[65] = 0;
-            array2[66] = 0;
-            array2[67] = 0;
-            array2[68] = 0;
-            array2[69] = 0;
-            array2[70] = 0;
-            array2[71] = 0;
-            array2[72] = 0;
-            array2[73] = 0;
-            array2[74] = 0;
-            array2[75] = 0;
-            array2[76] = 0;
-            array2[77] = 0;
-            array2[78] = 0;
-            array2[79] = 0;
-            array2[80] = 0;
-            array2[81] = 0;
-            array2[82] = 0;
-            array2[83] = 0;
-            array2[84] = 0;
-            array2[85] = 0;
-            array2[86] = 0;
-            array2[87] = 0;
-            array2[88] = 0;
-            array2[89] = 0;
-            array2[90] = 0;
-            array2[91] = 0;
-            array2[92] = 0;
-            array2[93] = 0;
-            array2[94] = 0;
-            array2[95] = 0;
-            array2[96] = 0;
-            array2[97] = 0;
-            array2[98] = 0;
-            array2[99] = 0;
-
-            array2[100] = 0;
-            array2[101] = 0;
-            array2[102] = 0;
-            array2[103] = 0;
-            array2[104] = 0;
-            array2[105] = 0;
-            array2[106] = 0;
-            array2[107] = 0;
-            array2[108] = 0;
-            array2[109] = 0;
-            array2[110] = 0;
-            array2[111] = 0;
-            array2[112] = 0;
-            array2[113] = 0;
-            array2[114] = 0;
-            array2[115] = 0;
-            array2[116] = 0;
-            array2[117] = 0;
-            array2[118] = 0;
-            array2[119] = 0;
-            array2[120] = 0;
-            array2[121] = 0;
-            array2[122] = 0;
-            array2[123] = 0;
-            array2[124] = 0;
-            array2[125] = 0;
-            array2[126] = 0;
-            array2[127] = 0;
-            array2[128] = 0;
-            array2[129] = 0;
-            array2[130] = 0;
-            array2[131] = 0;
-            array2[132] = 0;
-            array2[133] = 0;
-            array2[134] = 0;
-            array2[135] = 0;
-            array2[136] = 0;
-            array2[137] = 0;
-            array2[138] = 0;
-            array2[139] = 0;
-            array2[140] = 0;
-            array2[141] = 0;
-            array2[142] = 0;
-            array2[143] = 0;
-            array2[144] = 0;
-            array2[145] = 0;
-            array2[146] = 0;
-            array2[147] = 0;
-            array2[148] = 0;
-            array2[149] = 0;
-            array2[150] = 0;
-            array2[151] = 0;
-            array2[152] = 0;
-            array2[153] = 0;
-            array2[154] = 0;
-            array2[155] = 0;
-            array2[156] = 0;
-            array2[157] = 0;
-            array2[158] = 0;
-            array2[159] = 0;
-            array2[160] = 0;
-            array2[161] = 0;
-            array2[162] = 0;
-            array2[163] = 0;
-            array2[164] = 0;
-            array2[165] = 0;
-            array2[166] = 0;
-            array2[167] = 0;
-            array2[168] = 0;
-            array2[169] = 0;
-            array2[170] = 0;
-            array2[171] = 0;
-            array2[172] = 0;
-            array2[173] = 0;
-            array2[174] = 0;
-            array2[175] = 0;
-            array2[176] = 0;
-            array2[177] = 0;
-            array2[178] = 0;
-            array2[179] = 0;
-            array2[180] = 0;
-            array2[181] = 0;
-            array2[182] = 0;
-            array2[183] = 0;
-            array2[184] = 0;
-            array2[185] = 0;
-            array2[186] = 0;
-            array2[187] = 0;
-            array2[188] = 0;
-            array2[189] = 0;
-            array2[190] = 0;
-            array2[191] = 0;
-            array2[192] = 0;
-            array2[193] = 0;
-            array2[194] = 0;
-            array2[195] = 0;
-            array2[196] = 0;
-            array2[197] = 0;
-            array2[198] = 0;
-            array2[199] = 0;
-            i++;
-
-            if (i == stop) { // requires a loop limit predicate
-                break;
-            }
-        }
-    }
-}

test/hotspot/jtreg/runtime/cds/appcds/LambdaEagerInit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,7 +109,6 @@ public class LambdaEagerInit {
     static void testDefaultArchiveWithEagerInitializationEnabled() throws Exception {
         // run with default CDS archive with the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions runOpts = (new CDSOptions())
-            .setXShareMode("auto")
             .addPrefix("-cp", appJar, testProperty,  "-Xlog:class+load,cds=debug")
             .setUseSystemArchive(true)
             .setUseVersion(false)
@@ -123,16 +122,13 @@ public class LambdaEagerInit {
     static void testDefaultArchiveWithEagerInitializationDisabled() throws Exception {
         // run with default CDS archive without the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions runOpts = (new CDSOptions())
-            .setXShareMode("auto")
             .addPrefix("-cp", appJar, "-Xlog:class+load,cds=debug")
             .setUseSystemArchive(true)
             .setUseVersion(false)
-            .addSuffix("-showversion", mainClass);
+            .addSuffix(mainClass);
         OutputAnalyzer output = CDSTestUtils.runWithArchive(runOpts);
-        if (output.getStderr().contains("sharing")) {
-            output.shouldMatch(lambdaLoadedFromArchive)
-                  .shouldMatch(cdsLoadedLambdaProxy);
-        }
-        output.shouldHaveExitValue(0);
+        output.shouldMatch(lambdaLoadedFromArchive)
+              .shouldMatch(cdsLoadedLambdaProxy)
+              .shouldHaveExitValue(0);
     }
 }

test/jdk/java/awt/GraphicsDevice/DisplayModes/ExtraAllocationTest.java

@@ -25,17 +25,13 @@ import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Path;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
-import jdk.jfr.Recording;
-import java.io.IOException;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordedFrame;
-import jdk.jfr.consumer.RecordingFile;
 
 /*
  * @test
@@ -43,21 +39,20 @@ import jdk.jfr.consumer.RecordingFile;
  *
  * @summary Test verifies that there is no extra allocation after display mode switch
  *
- * @run main/othervm -Xmx750M ExtraAllocationTest
+ * @run     main/othervm -Xmx750M ExtraAllocationTest
  */
 
+
 public class ExtraAllocationTest {
     private static final int MAX_MODES = 10;
     private static final int W = 500;
     private static final int H = 500;
     static JFrame f = null;
-    static long th = ((long) W * H * 32) / (8 * 2);
-    public static void main(String[] args) throws InterruptedException, InvocationTargetException,
-            IOException
-    {
-        Recording recording = new Recording();
-        recording.enable("jdk.ObjectAllocationOutsideTLAB");
-        recording.start();
+
+    public static void main(String[] args) throws InterruptedException, InvocationTargetException {
+        MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
+        memBean.gc();
+        Thread.sleep(2000);
         SwingUtilities.invokeAndWait(() -> {
             f = new JFrame();
             f.add(new JPanel());
@@ -71,38 +66,35 @@ public class ExtraAllocationTest {
         GraphicsDevice d = ge.getDefaultScreenDevice();
 
         if (d.isDisplayChangeSupported()) {
+            DisplayMode odm = d.getDisplayMode();
             DisplayMode[] modes = d.getDisplayModes();
-            int modesCount = Math.min(modes.length, MAX_MODES);
+            try {
+                int modesCount = Math.min(modes.length, MAX_MODES);
 
-            for (int i = 0; i < modesCount; i++) {
-                DisplayMode mode = modes[i];
-                try {
-                    d.setDisplayMode(mode);
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
+                for (int i = 0; i < modesCount; i++) {
+                    DisplayMode mode = modes[i];
+                    int w = mode.getWidth();
+                    int h = mode.getHeight();
+                    int bpp = mode.getBitDepth();
+                    long th = ((long) W * H * bpp) / (8 * 2);
+                    DisplayMode newMode =
+                            new DisplayMode(w, h, bpp, DisplayMode.REFRESH_RATE_UNKNOWN);
+                    long usedHeap = memBean.getHeapMemoryUsage().getUsed();
+                    d.setDisplayMode(newMode);
+                    Thread.sleep(2000);
+                    long memDiff =  memBean.getHeapMemoryUsage().getUsed() - usedHeap;
+                    if (memDiff > th) {
+                        throw new RuntimeException("Extra allocation detected: " + memDiff);
+                    }
+                    ManagementFactory.getMemoryMXBean().gc();
+                    Thread.sleep(2000);
                 }
-                Thread.sleep(2000);
+            } finally {
+                d.setDisplayMode(odm);
             }
         }
         f.setVisible(false);
         f.dispose();
         Thread.sleep(1000);
-        Path path = Path.of("recording.jfr");
-        recording.dump(path);
-        recording.close();
-        for (RecordedEvent event : RecordingFile.readAllEvents(path)) {
-            if ("jdk.ObjectAllocationOutsideTLAB".equalsIgnoreCase(event.getEventType().getName())) {
-                for (RecordedFrame recordedFrame :event.getStackTrace().getFrames()) {
-                    if (recordedFrame.isJavaFrame() &&
-                            "java.awt.image.DataBufferInt".equals(
-                                    recordedFrame.getMethod().getType().getName()) &&
-                            event.getLong("allocationSize") > th)
-                    {
-                        throw new RuntimeException("Extra allocation detected: " +
-                                event.getLong("allocationSize"));
-                    }
-                }
-            }
-        }
     }
 }

test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java

@@ -39,17 +39,13 @@ import java.io.IOException;
 /**
  * @test
  * @key headful
- * @bug 8073320 8280861
+ * @bug 8073320
  * @summary  Windows HiDPI support
  * @author Alexander Scherbatiy
  * @requires (os.family == "linux" | os.family == "windows")
  * @requires !display.XWayland
  * @run main/othervm -Dsun.java2d.win.uiScaleX=3 -Dsun.java2d.win.uiScaleY=2
  *                    HiDPIRobotScreenCaptureTest
- * @run main/othervm -Dsun.java2d.uiScale=1
- *                    HiDPIRobotScreenCaptureTest
- * @run main/othervm -Dsun.java2d.uiScale=2
- *                    HiDPIRobotScreenCaptureTest
  */
 
 public class HiDPIRobotScreenCaptureTest {
@@ -69,14 +65,7 @@ public class HiDPIRobotScreenCaptureTest {
         }
 
         Frame frame = new Frame();
-        // Position the frame on prime number coordinates to avoid
-        // them being multiple of the desktop scale; this tests Linux
-        // color picker better.
-        // Also, the position should be far enough from the top left
-        // corner of the screen to reduce the chance of being repositioned
-        // by the system because that area's occupied by the global
-        // menu bar and such.
-        frame.setBounds(83, 97, 400, 300);
+        frame.setBounds(40, 30, 400, 300);
         frame.setUndecorated(true);
 
         Panel panel = new Panel(new BorderLayout());
@@ -94,13 +83,6 @@ public class HiDPIRobotScreenCaptureTest {
                 g.fillRect(0, h / 2, w / 2, h / 2);
                 g.setColor(COLORS[3]);
                 g.fillRect(w / 2, h / 2, w / 2, h / 2);
-
-                // Several distinct pixels next to one another
-                // in order to test color picker's precision.
-                for (int i = 1; i < 4; i++) {
-                    g.setColor(COLORS[i]);
-                    g.fillRect(i, 0, 1, 1);
-                }
             }
         };
 
@@ -111,9 +93,6 @@ public class HiDPIRobotScreenCaptureTest {
         robot.waitForIdle();
         robot.delay(500);
 
-        final Point screenLocation = frame.getLocationOnScreen();
-        checkPixelColors(robot, screenLocation.x, screenLocation.y);
-
         Rectangle rect = canvas.getBounds();
         rect.setLocation(canvas.getLocationOnScreen());
 
@@ -128,28 +107,13 @@ public class HiDPIRobotScreenCaptureTest {
             throw new RuntimeException("Wrong image size!");
         }
 
-
         checkRectColor(image, new Rectangle(0, 0, w / 2, h / 2), COLORS[0]);
         checkRectColor(image, new Rectangle(w / 2, 0, w / 2, h / 2), COLORS[1]);
         checkRectColor(image, new Rectangle(0, h / 2, w / 2, h / 2), COLORS[2]);
         checkRectColor(image, new Rectangle(w / 2, h / 2, w / 2, h / 2), COLORS[3]);
     }
 
-    static void checkPixelColors(Robot robot, int x, int y) {
-        for (int i = 0; i < 4; i++) {
-            final Color actualColor = robot.getPixelColor(x + i, y);
-            System.out.print("Checking color at " + (x + i) + ", " + y + " to be equal to " + COLORS[i]);
-            if (!actualColor.equals(COLORS[i])) {
-                System.out.println("... Mismatch: found " + actualColor + " instead");
-                throw new RuntimeException("Wrong screen pixel color");
-
-            } else {
-                System.out.println("... OK");
-            }
-        }
-    }
-
-    private static final int OFFSET = 5;
+    private static final int OFFSET = 3;
     static void checkRectColor(BufferedImage image, Rectangle rect, Color expectedColor) {
         System.out.println("Checking rectangle " + rect + " to have color " + expectedColor);
         final Point[] pointsToCheck = new Point[] {

test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java

@@ -24,7 +24,7 @@
  /*
  * @test
  * @key headful
- * @bug 8162959 8280861
+ * @bug 8162959
  * @requires !display.XWayland
  * @summary Validate output of createMultiResolutionScreenCapture
  *          new API which returns MultiResolutionImage.
@@ -60,14 +60,7 @@ public class ScreenCaptureTest {
     public static void main(String[] args) throws Exception {
 
         frame = new Frame();
-        // Position the frame on prime number coordinates to avoid
-        // them being multiple of the desktop scale; this tests Linux
-        // color picker better.
-        // Also, the position should be far enough from the top left
-        // corner of the screen to reduce the chance of being repositioned
-        // by the system because that area's occupied by the global
-        // menu bar and such.
-        frame.setBounds(83, 97, 400, 400);
+        frame.setBounds(0, 0, 400, 400);
         frame.setUndecorated(true);
         robot = new Robot();
         Panel panel = new Panel(new BorderLayout());
@@ -100,7 +93,7 @@ public class ScreenCaptureTest {
         final int x = screenLocation.x;
         final int y = screenLocation.y;
         try {
-            // getPixelColor() tests
+            // getPixelColor Test
             checkRectColor(new Rectangle(x, y, w / 2, h / 2), COLORS[0]);
             checkRectColor(new Rectangle(x + w / 2, y, w / 2, h / 2), COLORS[1]);
             checkRectColor(new Rectangle(x, y + h / 2, w / 2, h / 2), COLORS[2]);
@@ -182,7 +175,7 @@ public class ScreenCaptureTest {
     }
 
 
-    private static final int OFFSET = 5;
+    private static final int OFFSET = 3;
     static void checkRectColor(Rectangle rect, Color expectedColor) {
         System.out.println("Checking rectangle " + rect + " to have color " + expectedColor);
         final Point[] pointsToCheck = new Point[] {

test/jdk/java/awt/a11y/AccessibleActionsTest.java

@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8281338
- * @summary Test for an element that has more than one Accessibility Action
- * @author Artem.Semenov@jetbrains.com
- * @run main/manual AccessibleActionsTest
- * @requires (os.family == "mac")
- */
-
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleAction;
-import javax.accessibility.AccessibleContext;
-import javax.swing.*;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Hashtable;
-import java.util.concurrent.CountDownLatch;
-
-public class AccessibleActionsTest extends AccessibleComponentTest {
-
-  @Override
-  public CountDownLatch createCountDownLatch() {
-    return new CountDownLatch(1);
-  }
-
-  void createTest() {
-    INSTRUCTIONS = "INSTRUCTIONS:\n"
-            + "Check a11y actions.\n\n"
-            + "Turn screen reader on, and Tab to the label.\n\n"
-            + "Perform the VO action \"Press\" (VO+space)\n"
-            + "Perform the VO action \"Show menu\" (VO+m)\n\n"
-            + "If after the first action the text of the label has changed, and after the second action the menu appears  tab further and press PASS, otherwise press FAIL.";
-
-    exceptionString = "AccessibleAction test failed!";
-    super.createUI(new AccessibleActionsTestFrame(), "AccessibleActionsTest");
-  }
-
-  void createTree() {
-    INSTRUCTIONS = "INSTRUCTIONS:\n"
-            + "Check a11y actions.\n\n"
-            + "Turn screen reader on, and Tab to the label.\n\n"
-            + "Perform the VO action \"Press\" (VO+space) on tree nodes\n\n"
-            + "If after press the tree node is expanded  tab further and press PASS, otherwise press FAIL.";
-
-    String root = "Root";
-    String[] nodes = new String[] {"One node", "Two node"};
-    String[][] leafs = new String[][]{{"leaf 1.1", "leaf 1.2", "leaf 1.3", "leaf 1.4"},
-            {"leaf 2.1", "leaf 2.2", "leaf 2.3", "leaf 2.4"}};
-
-    Hashtable<String, String[]> data = new Hashtable<String, String[]>();
-    for (int i = 0; i < nodes.length; i++) {
-      data.put(nodes[i], leafs[i]);
-    }
-
-    JTree tree = new JTree(data);
-    tree.setRootVisible(true);
-
-    JPanel panel = new JPanel();
-    panel.setLayout(new FlowLayout());
-    JScrollPane scrollPane = new JScrollPane(tree);
-    panel.add(scrollPane);
-    panel.setFocusable(false);
-
-    exceptionString = "AccessibleAction test failed!";
-    super.createUI(panel, "AccessibleActionsTest");
-  }
-
-  public static void main(String[] args) throws Exception {
-    AccessibleActionsTest test = new AccessibleActionsTest();
-
-    countDownLatch = test.createCountDownLatch();
-    SwingUtilities.invokeLater(test::createTest);
-    countDownLatch.await();
-
-    if (!testResult) {
-      throw new RuntimeException(a11yTest.exceptionString);
-    }
-
-    countDownLatch = test.createCountDownLatch();
-    SwingUtilities.invokeLater(test::createTree);
-    countDownLatch.await();
-
-    if (!testResult) {
-      throw new RuntimeException(a11yTest.exceptionString);
-    }
-  }
-
-  private class AccessibleActionsTestFrame extends JPanel {
-
-    public AccessibleActionsTestFrame() {
-      MyLabel label = new MyLabel("I'm waiting for the push");
-      label.setComponentPopupMenu(createPopup());
-      label.setFocusable(true);
-      add(label);
-      setLayout(new FlowLayout());
-    }
-
-    private static class MyLabel extends JLabel {
-      public MyLabel(String text) {
-        super(text);
-      }
-
-      @Override
-      public AccessibleContext getAccessibleContext() {
-        if (accessibleContext == null) {
-          accessibleContext = new MyAccessibleJLabel();
-        }
-        return accessibleContext;
-      }
-
-      private class MyAccessibleJLabel extends JLabel.AccessibleJLabel {
-        @Override
-        public AccessibleAction getAccessibleAction() {
-          return new AccessibleAction() {
-            @Override
-            public int getAccessibleActionCount() {
-              return 2;
-            }
-
-            @Override
-            public String getAccessibleActionDescription(int i) {
-              if (i == 0) {
-                return AccessibleAction.CLICK;
-              }
-              return AccessibleAction.TOGGLE_POPUP;
-            }
-
-            @Override
-            public boolean doAccessibleAction(int i) {
-              if (i == 0) {
-                changeText(MyLabel.this, "label is pressed");
-                return true;
-              }
-              JPopupMenu popup = createPopup();
-              popup.show(MyLabel.this, 0, 0);
-              return true;
-            }
-          };
-        }
-      }
-    }
-
-    private static JPopupMenu createPopup() {
-      JPopupMenu popup = new JPopupMenu("MENU");
-      popup.add("One");
-      popup.add("Two");
-      popup.add("Three");
-      return popup;
-    }
-
-    private static void changeText(JLabel label, String text) {
-      label.setText(text);
-    }
-
-  }
-}

test/jdk/java/awt/image/VolatileImage/GradientPaints.java

@@ -39,9 +39,7 @@ import java.awt.geom.*;
 import java.awt.image.*;
 import java.io.File;
 import java.util.Arrays;
-import java.util.concurrent.CountDownLatch;
 import javax.imageio.ImageIO;
-import javax.swing.SwingUtilities;
 
 public class GradientPaints extends Canvas {
 
@@ -70,8 +68,8 @@ public class GradientPaints extends Canvas {
         (int)(TESTW * TESTH * 0.18);
     private static final int ALLOWED_MISMATCHES_RADIAL =
         (int)(TESTW * TESTH * 0.45);
-    private static final int ALLOWED_RENDER_ATTEMPTS = 5;
 
+    private static boolean done;
     private static boolean verbose;
 
     private static final Color[] COLORS = {
@@ -85,8 +83,8 @@ public class GradientPaints extends Canvas {
         new Color(128, 128, 128),
     };
 
-    private enum PaintType {BASIC, LINEAR, RADIAL}
-    private enum XformType {IDENTITY, TRANSLATE, SCALE, SHEAR, ROTATE}
+    private static enum PaintType {BASIC, LINEAR, RADIAL};
+    private static enum XformType {IDENTITY, TRANSLATE, SCALE, SHEAR, ROTATE};
     private static final int[] numStopsArray = {2, 4, 7};
     private static final Object[] hints = {
         RenderingHints.VALUE_ANTIALIAS_OFF,
@@ -94,14 +92,35 @@ public class GradientPaints extends Canvas {
     };
 
     public void paint(Graphics g) {
-        painted.countDown();
+        synchronized (this) {
+            if (!done) {
+                done = true;
+                notifyAll();
+            }
+        }
+    }
+
+    private void testOne(BufferedImage refImg, VolatileImage testImg) {
+        Graphics2D gref  = refImg.createGraphics();
+        Graphics2D gtest = testImg.createGraphics();
+        Paint paint =
+            makePaint(PaintType.RADIAL, CycleMethod.REPEAT,
+                      ColorSpaceType.SRGB, XformType.IDENTITY, 7);
+        Object aahint = hints[0];
+        renderTest(gref,  paint, aahint);
+        renderTest(gtest, paint, aahint);
+        Toolkit.getDefaultToolkit().sync();
+        compareImages(refImg, testImg.getSnapshot(),
+                      TOLERANCE, 0, "");
+        gref.dispose();
+        gtest.dispose();
     }
 
     private void testAll(Graphics gscreen,
-                         BufferedImage refImg, VolatileImage testImg, GraphicsConfiguration gc)
+                         BufferedImage refImg, VolatileImage testImg)
     {
         Graphics2D gref  = refImg.createGraphics();
-        testImg.validate(gc);
+        Graphics2D gtest = testImg.createGraphics();
         for (PaintType paintType : PaintType.values()) {
             for (CycleMethod cycleMethod : CycleMethod.values()) {
                 for (ColorSpaceType colorSpace : ColorSpaceType.values()) {
@@ -119,32 +138,16 @@ public class GradientPaints extends Canvas {
                                     " numStops=" + numStops +
                                     " aa=" + aahint;
                                 renderTest(gref,  paint, aahint);
-                                int allowedMismatches = paintType == PaintType.RADIAL ?
-                                        ALLOWED_MISMATCHES_RADIAL : ALLOWED_MISMATCHES_LINEAR;
-                                int attempt = 0;
-                                while (true) {
-                                    Graphics2D gtest = testImg.createGraphics();
-                                    renderTest(gtest, paint, aahint);
-                                    gscreen.drawImage(testImg, 0, 0, null);
-                                    Toolkit.getDefaultToolkit().sync();
-                                    gtest.dispose();
-                                    BufferedImage snapshot = testImg.getSnapshot();
-                                    if (testImg.contentsLost() &&
-                                        testImg.validate(gc) != VolatileImage.IMAGE_OK)
-                                    {
-                                        if (attempt++ >= ALLOWED_RENDER_ATTEMPTS) {
-                                            throw new RuntimeException("Cannot render to VI");
-                                        }
-                                        try {
-                                            Thread.sleep(100);
-                                        } catch (InterruptedException e) {
-                                            e.printStackTrace();
-                                        }
-                                        continue;
-                                    }
-                                    compareImages(refImg, snapshot, allowedMismatches, msg);
-                                    break;
-                                }
+                                renderTest(gtest, paint, aahint);
+                                gscreen.drawImage(testImg, 0, 0, null);
+                                Toolkit.getDefaultToolkit().sync();
+                                int allowedMismatches =
+                                    paintType == PaintType.RADIAL ?
+                                    ALLOWED_MISMATCHES_RADIAL :
+                                    ALLOWED_MISMATCHES_LINEAR;
+                                compareImages(refImg, testImg.getSnapshot(),
+                                              TOLERANCE, allowedMismatches,
+                                              msg);
                             }
                         }
                     }
@@ -152,6 +155,7 @@ public class GradientPaints extends Canvas {
             }
         }
         gref.dispose();
+        gtest.dispose();
     }
 
     private Paint makePaint(PaintType paintType,
@@ -168,6 +172,7 @@ public class GradientPaints extends Canvas {
         int focusX   = ctrX + 20;
         int focusY   = ctrY + 20;
         float radius = 100.0f;
+        Paint paint;
         AffineTransform transform;
 
         Color[] colors = Arrays.copyOf(COLORS, numStops);
@@ -176,30 +181,57 @@ public class GradientPaints extends Canvas {
             fractions[i] = ((float)i) / (fractions.length-1);
         }
 
-        transform = switch (xformType) {
-            case IDENTITY -> new AffineTransform();
-            case TRANSLATE -> AffineTransform.getTranslateInstance(2, 2);
-            case SCALE -> AffineTransform.getScaleInstance(1.2, 1.4);
-            case SHEAR -> AffineTransform.getShearInstance(0.1, 0.1);
-            case ROTATE -> AffineTransform.getRotateInstance(Math.PI / 4,
-                    getWidth() >> 1, getHeight() >> 1);
-        };
+        switch (xformType) {
+        default:
+        case IDENTITY:
+            transform = new AffineTransform();
+            break;
+        case TRANSLATE:
+            transform = AffineTransform.getTranslateInstance(2, 2);
+            break;
+        case SCALE:
+            transform = AffineTransform.getScaleInstance(1.2, 1.4);
+            break;
+        case SHEAR:
+            transform = AffineTransform.getShearInstance(0.1, 0.1);
+            break;
+        case ROTATE:
+            transform = AffineTransform.getRotateInstance(Math.PI / 4,
+                                                          getWidth()/2,
+                                                          getHeight()/2);
+            break;
+        }
 
-        return switch (paintType) {
-            case BASIC -> new GradientPaint(startX, startY, Color.RED,
-                    endX, endY, Color.BLUE, (cycleMethod != CycleMethod.NO_CYCLE));
-            case LINEAR -> new LinearGradientPaint(new Point2D.Float(startX, startY),
-                            new Point2D.Float(endX, endY),
-                            fractions, colors,
-                            cycleMethod, colorSpace,
-                            transform);
-            case RADIAL -> new RadialGradientPaint(new Point2D.Float(ctrX, ctrY),
-                            radius,
-                            new Point2D.Float(focusX, focusY),
-                            fractions, colors,
-                            cycleMethod, colorSpace,
-                            transform);
-        };
+        switch (paintType) {
+        case BASIC:
+            boolean cyclic = (cycleMethod != CycleMethod.NO_CYCLE);
+            paint =
+                new GradientPaint(startX, startY, Color.RED,
+                                  endX, endY, Color.BLUE, cyclic);
+            break;
+
+        default:
+        case LINEAR:
+            paint =
+                new LinearGradientPaint(new Point2D.Float(startX, startY),
+                                        new Point2D.Float(endX, endY),
+                                        fractions, colors,
+                                        cycleMethod, colorSpace,
+                                        transform);
+            break;
+
+        case RADIAL:
+            paint =
+                new RadialGradientPaint(new Point2D.Float(ctrX, ctrY),
+                                        radius,
+                                        new Point2D.Float(focusX, focusY),
+                                        fractions, colors,
+                                        cycleMethod, colorSpace,
+                                        transform);
+            break;
+        }
+
+        return paint;
     }
 
     private void renderTest(Graphics2D g2d, Paint p, Object aahint) {
@@ -216,7 +248,7 @@ public class GradientPaints extends Canvas {
 
     private static void compareImages(BufferedImage refImg,
                                       BufferedImage testImg,
-                                      int allowedMismatches,
+                                      int tolerance, int allowedMismatches,
                                       String msg)
     {
         int numMismatches = 0;
@@ -229,7 +261,7 @@ public class GradientPaints extends Canvas {
             for (int x = x1; x < x2; x++) {
                 Color expected = new Color(refImg.getRGB(x, y));
                 Color actual   = new Color(testImg.getRGB(x, y));
-                if (!isSameColor(expected, actual)) {
+                if (!isSameColor(expected, actual, tolerance)) {
                     numMismatches++;
                 }
             }
@@ -245,7 +277,6 @@ public class GradientPaints extends Canvas {
                 ImageIO.write(testImg, "png",
                               new File("GradientPaints.cap.png"));
             } catch (Exception e) {
-                e.printStackTrace();
             }
             if (!verbose) {
                 System.err.println(msg);
@@ -254,49 +285,53 @@ public class GradientPaints extends Canvas {
                                        numMismatches +
                                        ") exceeds limit (" +
                                        allowedMismatches +
-                                       ") with tolerance=" + TOLERANCE);
+                                       ") with tolerance=" +
+                                       tolerance);
         }
     }
 
-    private static boolean isSameColor(Color c1, Color c2) {
+    private static boolean isSameColor(Color c1, Color c2, int e) {
         int r1 = c1.getRed();
         int g1 = c1.getGreen();
         int b1 = c1.getBlue();
         int r2 = c2.getRed();
         int g2 = c2.getGreen();
         int b2 = c2.getBlue();
-        int rmin = Math.max(r2- TOLERANCE, 0);
-        int gmin = Math.max(g2- TOLERANCE, 0);
-        int bmin = Math.max(b2- TOLERANCE, 0);
-        int rmax = Math.min(r2+ TOLERANCE, 255);
-        int gmax = Math.min(g2+ TOLERANCE, 255);
-        int bmax = Math.min(b2+ TOLERANCE, 255);
-        return r1 >= rmin && r1 <= rmax &&
-                g1 >= gmin && g1 <= gmax &&
-                b1 >= bmin && b1 <= bmax;
+        int rmin = Math.max(r2-e, 0);
+        int gmin = Math.max(g2-e, 0);
+        int bmin = Math.max(b2-e, 0);
+        int rmax = Math.min(r2+e, 255);
+        int gmax = Math.min(g2+e, 255);
+        int bmax = Math.min(b2+e, 255);
+        if (r1 >= rmin && r1 <= rmax &&
+            g1 >= gmin && g1 <= gmax &&
+            b1 >= bmin && b1 <= bmax)
+        {
+            return true;
+        }
+        return false;
     }
 
-    static CountDownLatch painted = new CountDownLatch(1);
-    static Frame frame = null;
-
     public static void main(String[] args) {
         if (args.length == 1 && args[0].equals("-verbose")) {
             verbose = true;
         }
 
         GradientPaints test = new GradientPaints();
-        SwingUtilities.invokeLater(() -> {
-            frame = new Frame();
-            frame.add(test);
-            frame.pack();
-            frame.setVisible(true);
-        });
+        Frame frame = new Frame();
+        frame.add(test);
+        frame.pack();
+        frame.setVisible(true);
 
         // Wait until the component's been painted
-        try {
-            painted.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Failed: Interrupted");
+        synchronized (test) {
+            while (!done) {
+                try {
+                    test.wait();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException("Failed: Interrupted");
+                }
+            }
         }
 
         GraphicsConfiguration gc = frame.getGraphicsConfiguration();
@@ -310,9 +345,10 @@ public class GradientPaints extends Canvas {
         BufferedImage refImg =
             new BufferedImage(TESTW, TESTH, BufferedImage.TYPE_INT_RGB);
         VolatileImage testImg = frame.createVolatileImage(TESTW, TESTH);
+        testImg.validate(gc);
 
         try {
-            test.testAll(test.getGraphics(), refImg, testImg, gc);
+            test.testAll(test.getGraphics(), refImg, testImg);
         } finally {
             frame.dispose();
         }

test/jdk/jb/build/CheckJBRModules.java

@@ -1,106 +0,0 @@
-/*
- * Copyright 2022 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-/**
- * @test
- * @requires !vm.graal.enabled
- * @summary Verifies the list of available modules
- * @library /test/lib
- * @run main CheckJBRModules
- */
-public class CheckJBRModules {
-    static final String moduleNames[] = {
-                    "java.base",
-                    "java.compiler",
-                    "java.datatransfer",
-                    "java.desktop",
-                    "java.instrument",
-                    "java.logging",
-                    "java.management",
-                    "java.management.rmi",
-                    "java.naming",
-                    "java.net.http",
-                    "java.prefs",
-                    "java.rmi",
-                    "java.scripting",
-                    "java.se",
-                    "java.security.jgss",
-                    "java.security.sasl",
-                    "java.smartcardio",
-                    "java.sql",
-                    "java.sql.rowset",
-                    "java.transaction.xa",
-                    "java.xml",
-                    "java.xml.crypto",
-                    "jdk.accessibility",
-                    "jdk.attach",
-                    "jdk.charsets",
-                    "jdk.compiler",
-                    "jdk.crypto.cryptoki",
-                    "jdk.crypto.ec",
-                    "jdk.dynalink",
-                    "jdk.httpserver",
-                    "jdk.internal.ed",
-                    "jdk.internal.le",
-                    "jdk.internal.vm.ci",
-                    "jdk.javadoc",
-                    "jdk.jdi",
-                    "jdk.jdwp.agent",
-                    "jdk.jfr",
-                    "jdk.jsobject",
-                    "jdk.localedata",
-                    "jdk.management",
-                    "jdk.management.agent",
-                    "jdk.management.jfr",
-                    "jdk.naming.dns",
-                    "jdk.naming.rmi",
-                    "jdk.net",
-                    "jdk.sctp",
-                    "jdk.security.auth",
-                    "jdk.security.jgss",
-                    "jdk.unsupported",
-                    "jdk.unsupported.desktop",
-                    "jdk.xml.dom",
-                    "jdk.zipfs",
-                    "jdk.hotspot.agent",
-                    "jdk.jcmd" };
-
-    public static void main(String args[]) throws Exception {
-        final OutputAnalyzer oa = exec("--list-modules").shouldHaveExitValue(0);
-        for(String moduleName : moduleNames) {
-            oa.shouldContain(moduleName);
-        }
-    }
-
-    /**
-     * java args... returning the OutputAnalyzer to analyzer the output
-     */
-    private static OutputAnalyzer exec(String... args) throws Exception {
-        return ProcessTools.executeTestJava(args)
-                .outputTo(System.out)
-                .errorTo(System.out);
-    }
-}

test/jdk/jb/build/CheckJBRModulesWindows.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2022 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-/**
- * @test
- * @requires !vm.graal.enabled
- * @requires (os.family == "windows")
- * @summary Verifies the list of available modules specific to Windows
- * @library /test/lib
- * @run main CheckJBRModulesWindows
- */
-public class CheckJBRModulesWindows {
-    static final String moduleNames[] = { "jdk.crypto.mscapi" };
-
-    public static void main(String args[]) throws Exception {
-        final OutputAnalyzer oa = exec("--list-modules").shouldHaveExitValue(0);
-        for(String moduleName : moduleNames) {
-            oa.shouldContain(moduleName);
-        }
-    }
-
-    /**
-     * java args... returning the OutputAnalyzer to analyzer the output
-     */
-    private static OutputAnalyzer exec(String... args) throws Exception {
-        return ProcessTools.executeTestJava(args)
-                .outputTo(System.out)
-                .errorTo(System.out);
-    }
-}

test/jdk/jb/java/api/backend/ProxyInfoResolvingTest.java

@@ -35,13 +35,13 @@ public class ProxyInfoResolvingTest {
         JBRApi.ModuleRegistry r = init();
         // No mapping defined -> null
         requireNull(getProxy(ProxyInfoResolvingTest.class));
-        // Invalid JBR-side target class -> null
+        // Invalid JBR-side target class -> error
         r.proxy(InterfaceWithoutImplementation.class.getName(), "absentImpl");
-        requireNull(getProxy(InterfaceWithoutImplementation.class));
-        // Invalid JBR-side target static method mapping -> null
+        mustFail(() -> getProxy(InterfaceWithoutImplementation.class), RuntimeException.class, ClassNotFoundException.class);
+        // Invalid JBR-side target static method mapping -> error
         r.service(ServiceWithoutImplementation.class.getName(), null)
                 .withStatic("someMethod", "NoClass");
-        requireNull(getProxy(ServiceWithoutImplementation.class));
+        mustFail(() -> getProxy(ServiceWithoutImplementation.class), RuntimeException.class, ClassNotFoundException.class);
         // Service without target class or static method mapping -> null
         r.service(EmptyService.class.getName(), null);
         requireNull(getProxy(EmptyService.class));

test/jdk/jb/java/awt/Focus/MacSpecialFocusLostCase.java

@@ -1,85 +0,0 @@
-/*
- * Copyright 2022 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.KeyEvent;
-
-/**
- * @test
- * @summary Regression test for JBR-4281 Window losing focus isn't detected in some cases on macOS
- * @key headful
- * @requires (os.family == "mac")
- */
-
-public class MacSpecialFocusLostCase {
-    private static Robot robot;
-    private static JFrame frame;
-
-    public static void main(String[] args) throws Exception {
-        robot = new Robot();
-        robot.setAutoDelay(50);
-        try {
-            SwingUtilities.invokeAndWait(MacSpecialFocusLostCase::initUI);
-            checkFocusedStatus(true);
-            pressCmdSpace(); // open Spotlight popup
-            checkFocusedStatus(false);
-            pressEsc(); // close Spotlight popup
-            checkFocusedStatus(true);
-        } finally {
-            pressEsc(); // make sure popup is closed in any case
-            SwingUtilities.invokeAndWait(MacSpecialFocusLostCase::disposeUI);
-        }
-    }
-
-    private static void initUI() {
-        frame = new JFrame("MacSpecialFocusLostCase");
-        frame.setBounds(200, 200, 300, 200);
-        frame.setVisible(true);
-    }
-
-    private static void disposeUI() {
-        if (frame != null) frame.dispose();
-    }
-
-    private static void checkFocusedStatus(boolean expected) throws Exception {
-        robot.delay(1000);
-        boolean[] result = new boolean[1];
-        SwingUtilities.invokeAndWait(() -> result[0] = frame.isFocused());
-        if (result[0] != expected) {
-            throw new RuntimeException(expected ? "Frame isn't focused" : "Frame is still focused");
-        }
-    }
-
-    private static void pressCmdSpace() {
-        robot.keyPress(KeyEvent.VK_META);
-        robot.keyPress(KeyEvent.VK_SPACE);
-        robot.keyRelease(KeyEvent.VK_SPACE);
-        robot.keyRelease(KeyEvent.VK_META);
-    }
-
-    private static void pressEsc() {
-        robot.keyPress(KeyEvent.VK_ESCAPE);
-        robot.keyRelease(KeyEvent.VK_ESCAPE);
-    }
-}

test/jdk/jb/java/awt/Toolkit/AWTThreadingTest.java

@@ -1,7 +1,7 @@
 import java.awt.*;
-import javax.swing.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -9,9 +9,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
+import sun.awt.InvokeOnToolkitHelper;
 import sun.lwawt.macosx.CThreading;
 import sun.lwawt.macosx.LWCToolkit;
-import sun.awt.AWTThreading;
+
+import javax.swing.*;
 
 /*
  * @test
@@ -48,7 +50,6 @@ public class AWTThreadingTest {
 
     static void runGui() {
         frame = new JFrame("frame");
-        frame.getContentPane().setBackground(Color.green);
         frame.setLocationRelativeTo(null);
         frame.setSize(200, 200);
         frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
@@ -87,7 +88,7 @@ public class AWTThreadingTest {
                 EventQueue.invokeLater(() -> {
                     passed.set(false);
 
-                    Boolean success = AWTThreading.executeWaitToolkit(() -> {
+                    Boolean success = InvokeOnToolkitHelper.invokeAndBlock(() -> {
                         try {
                             return CThreading.executeOnAppKit(() -> Boolean.TRUE);
                         } catch (Throwable e) {

test/jdk/jb/java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java

@@ -1,229 +0,0 @@
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.InvocationEvent;
-import java.util.Optional;
-import java.util.concurrent.*;
-import java.util.function.Consumer;
-import java.util.logging.*;
-
-import sun.awt.AWTAccessor;
-import sun.awt.AWTThreading;
-import sun.lwawt.macosx.CThreading;
-import sun.lwawt.macosx.LWCToolkit;
-
-/*
- * @test
- * @summary Tests different scenarios for LWCToolkit.invokeAndWait().
- * @requires (os.family == "mac")
- * @modules java.desktop/sun.lwawt.macosx java.desktop/sun.awt
- * @run main LWCToolkitInvokeAndWaitTest
- * @run main/othervm -DAWTThreading.level.FINER=true LWCToolkitInvokeAndWaitTest
- * @author Anton Tarasov
- */
-@SuppressWarnings("ConstantConditions")
-public class LWCToolkitInvokeAndWaitTest {
-    // This property is used in {CAccessibility}
-    private static final int INVOKE_TIMEOUT_SECONDS = Integer.getInteger("sun.lwawt.macosx.CAccessibility.invokeTimeoutSeconds", 1);
-
-    static TestLogHandler LOG_HANDLER = new TestLogHandler();
-    static volatile CompletableFuture<Boolean> FUTURE;
-    static volatile CountDownLatch EDT_FAST_FREE_LATCH;
-    static volatile JFrame FRAME;
-    static volatile Thread MAIN_THREAD;
-    static int TEST_COUNTER;
-
-    static final Runnable CONSUME_DISPATCHING = () -> FUTURE.completeExceptionally(new Throwable("Unexpected dispatching!"));
-
-    static {
-        AWTThreading.setAWTThreadingFactory(edt -> new AWTThreading(edt) {
-            @Override
-            public CompletableFuture<Void> onEventDispatchThreadFree(Runnable runnable) {
-                if (EDT_FAST_FREE_LATCH != null) {
-                    // 1. wait for the invocation event to be dispatched
-                    // 2. wait for EDT to become free
-                    trycatch(() -> EDT_FAST_FREE_LATCH.await());
-
-                    EDT_FAST_FREE_LATCH = null;
-                }
-                // if EDT is free the runnable should be called immediately
-                return super.onEventDispatchThreadFree(runnable);
-            }
-            @Override
-            public void notifyEventDispatchThreadFree() {
-                if (EDT_FAST_FREE_LATCH != null &&
-                    // if the invocation event is dispatched by now
-                    EDT_FAST_FREE_LATCH.getCount() == 1)
-                {
-                    EDT_FAST_FREE_LATCH.countDown();
-                }
-                super.notifyEventDispatchThreadFree();
-            }
-        });
-    }
-
-    public static void main(String[] args) {
-        MAIN_THREAD = Thread.currentThread();
-
-        trycatch(() -> {
-            Logger log = LogManager.getLogManager().getLogger(AWTThreading.class.getName());
-            log.setUseParentHandlers(false);
-            log.addHandler(LOG_HANDLER);
-            if (Boolean.getBoolean("AWTThreading.level.FINER")) {
-                log.setLevel(Level.FINER);
-            }
-        });
-
-        Consumer<InvocationEvent> noop = e -> {};
-
-        try {
-            trycatch(() -> EventQueue.invokeAndWait(LWCToolkitInvokeAndWaitTest::runGui));
-
-            test("InvocationEvent is normally dispatched",
-                "",
-                noop,
-                () -> System.out.println("I'm dispatched"));
-
-            test("InvocationEvent is lost",
-                "lost",
-                noop,
-                CONSUME_DISPATCHING);
-
-            EDT_FAST_FREE_LATCH = new CountDownLatch(2);
-            test("InvocationEvent is lost (EDT becomes fast free)",
-                "lost",
-                // notify the invocationEvent has been dispatched
-                invocationEvent -> EDT_FAST_FREE_LATCH.countDown(),
-                CONSUME_DISPATCHING);
-
-            test("InvocationEvent is disposed",
-                "disposed",
-                invocationEvent -> AWTAccessor.getInvocationEventAccessor().dispose(invocationEvent),
-                CONSUME_DISPATCHING);
-
-            test("InvocationEvent is timed out (delayed before dispatching)",
-                "timed out",
-                invocationEvent -> sleep(INVOKE_TIMEOUT_SECONDS * 4),
-                CONSUME_DISPATCHING);
-
-            test("InvocationEvent is timed out (delayed during dispatching)",
-                "timed out",
-                noop,
-                () -> sleep(INVOKE_TIMEOUT_SECONDS * 4));
-
-        } finally {
-            FRAME.dispose();
-        }
-        System.out.println("Test PASSED");
-    }
-
-    static void runGui() {
-        FRAME = new JFrame(LWCToolkitInvokeAndWaitTest.class.getSimpleName());
-        FRAME.getContentPane().setBackground(Color.green);
-        FRAME.setLocationRelativeTo(null);
-        FRAME.setSize(200, 200);
-        FRAME.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-        FRAME.setVisible(true);
-    }
-
-    static void test(String testCaption,
-                     String expectedInLog,
-                     Consumer<InvocationEvent> onBeforeDispatching,
-                     Runnable onDispatching)
-    {
-        System.out.println("\n(" + (++TEST_COUNTER) + ") TEST: " + testCaption);
-
-        FUTURE = new CompletableFuture<>();
-        FUTURE.whenComplete((r, ex) -> Optional.of(ex).ifPresent(Throwable::printStackTrace));
-
-        EventQueue.invokeLater(() -> subTest(onBeforeDispatching, onDispatching));
-
-        trycatch(() -> {
-            if (!FUTURE.get(INVOKE_TIMEOUT_SECONDS * 2L, TimeUnit.SECONDS)) {
-                throw new RuntimeException("Test FAILED! (negative result)");
-            }
-        });
-
-        // let AppKit and EDT print all the logging
-        var latch = new CountDownLatch(1);
-        CThreading.executeOnAppKit(latch::countDown);
-        trycatch(latch::await);
-        trycatch(() -> EventQueue.invokeAndWait(() -> {}));
-
-        if (!LOG_HANDLER.testContains(expectedInLog)) {
-            throw new RuntimeException("Test FAILED! (not found in the log: \"" + expectedInLog + "\")");
-        }
-
-        System.out.println("(" + TEST_COUNTER + ") SUCCEEDED\n");
-    }
-
-    static void subTest(Consumer<InvocationEvent> onBeforeDispatching, Runnable onDispatching) {
-        Toolkit.getDefaultToolkit().getSystemEventQueue().push(new EventQueue() {
-            @Override
-            protected void dispatchEvent(AWTEvent event) {
-                //
-                // Intercept the invocation posted from Appkit.
-                //
-                if (event instanceof AWTThreading.TrackedInvocationEvent) {
-                    System.out.println("Before dispatching: " + event);
-                    onBeforeDispatching.accept((InvocationEvent)event);
-
-                    if (onDispatching == CONSUME_DISPATCHING) {
-                        System.out.println("Consuming: " + event);
-                        return;
-                    }
-                }
-                super.dispatchEvent(event);
-            }
-        });
-        CThreading.executeOnAppKit(() -> trycatch(() -> {
-            //
-            // Post an invocation from AppKit.
-            //
-            LWCToolkit.invokeAndWait(onDispatching, FRAME, false, INVOKE_TIMEOUT_SECONDS);
-            FUTURE.complete(true);
-        }));
-    }
-
-    static void sleep(int seconds) {
-        trycatch(() -> Thread.sleep(seconds * 1000L));
-    }
-    
-    static void trycatch(ThrowableRunnable runnable) {
-        try {
-            runnable.run();
-        } catch (Exception e) {
-            if (Thread.currentThread() == MAIN_THREAD) {
-                throw new RuntimeException("Test FAILED!", e);
-            } else {
-                FUTURE.completeExceptionally(e);
-            }
-        }
-    }
-    
-    interface ThrowableRunnable {
-        void run() throws Exception;
-    }
-
-    static class TestLogHandler extends StreamHandler {
-        public StringBuilder buffer = new StringBuilder();
-
-        public TestLogHandler() {
-            // Use System.out to merge with the test printing.
-            super(System.out, new SimpleFormatter());
-            setLevel(Level.ALL);
-        }
-
-        @Override
-        public void publish(LogRecord record) {
-            buffer.append(record.getMessage());
-            super.publish(record);
-            flush();
-        }
-
-        public boolean testContains(String str) {
-            boolean contains = buffer.toString().contains(str);
-            buffer.setLength(0);
-            return contains;
-        }
-    }
-}

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Layout_ABC.java

@@ -35,20 +35,20 @@ public enum Layout_ABC implements LayoutKey {
     // located on the left side of the key 1 on the Apple International English keyboard
     // SECTION       ('§', '§', '±', '±'),
 
-    VK_MINUS         ('-', '–', '_', '—', '\u001F'),
-    VK_EQUALS        ('=', '≠', '+', '±', '='),
+    VK_MINUS         ('-', '–', '_', '—'),
+    VK_EQUALS        ('=', '≠', '+', '±'),
 
-    VK_OPEN_BRACKET  ('[', '“', '{', '”', '\u001B'),
-    VK_CLOSE_BRACKET (']', '‘', '}', '’', '\u001D'),
+    VK_OPEN_BRACKET  ('[', '“', '{', '”'),
+    VK_CLOSE_BRACKET (']', '‘', '}', '’'),
 
-    VK_SEMICOLON     (';',  '…', ':', 'Ú', ';'),
-    VK_QUOTE         ('\'', 'æ', '"', 'Æ', '\''),
-    VK_BACK_SLASH    ('\\', '«', '|', '»', '\u001C'),
+    VK_SEMICOLON     (';',  '…', ':', 'Ú'),
+    VK_QUOTE         ('\'', 'æ', '"', 'Æ'),
+    VK_BACK_SLASH    ('\\', '«', '|', '»'),
 
-    VK_BACK_QUOTE    (KeyChar.ch('`'), KeyChar.dead('`'), KeyChar.ch('~'), KeyChar.ch('`'), KeyChar.ch('`')),
-    VK_COMMA         (',', '≤', '<', '¯', ','),
-    VK_PERIOD        ('.', '≥', '>', '˘', '.'),
-    VK_SLASH         ('/', '÷', '?', '¿', '/'),
+    VK_BACK_QUOTE    (KeyChar.ch('`'), KeyChar.dead('`'), KeyChar.ch('~'), KeyChar.ch('`')),
+    VK_COMMA         (',', '≤', '<', '¯'),
+    VK_PERIOD        ('.', '≥', '>', '˘'),
+    VK_SLASH         ('/', '÷', '?', '¿'),
 
     //VK_1 ('1', '¡', '!', '⁄'),
     //VK_2 ('2', '™', '@', '€'),
@@ -99,12 +99,12 @@ public enum Layout_ABC implements LayoutKey {
 
     private final Key key;
 
-    Layout_ABC(char no, char alt, char shift, char alt_shift, char control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_ABC(char no, char alt, char shift, char alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
-    Layout_ABC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_ABC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
     public Key getKey() {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Layout_FRENCH_PC.java

@@ -30,20 +30,20 @@ public enum Layout_FRENCH_PC implements LayoutKey {
     // Enum name must be the same as KeyEvent.VK_ constant name corresponding to the key on US keyboard layout
     // Note that '\u0000' may be used if no char is mapped to a key + modifier or if one wants to skip its testing
 
-    VK_MINUS         (')', ']', '°', ']', '\u001B'),
-    VK_EQUALS        ('=', '}', '+', '≠', '\u001F'),
+    VK_MINUS         (')', ']', '°', ']'),
+    VK_EQUALS        ('=', '}', '+', '≠'),
 
-    VK_OPEN_BRACKET  (KeyChar.dead('^'), KeyChar.ch('ô'), KeyChar.dead('¨'), KeyChar.ch('Ô'), KeyChar.ch('\u001E')),
-    VK_CLOSE_BRACKET ('$', '¤', '£', '¥', '\u001D'),
+    VK_OPEN_BRACKET  (KeyChar.dead('^'), KeyChar.ch('ô'), KeyChar.dead('¨'), KeyChar.ch('Ô')),
+    VK_CLOSE_BRACKET ('$', '¤', '£', '¥'),
 
-    VK_SEMICOLON     ('m', 'µ', 'M', 'Ó', '\r'),
-    VK_QUOTE         ('ù', 'Ù', '%', '‰', 'ù'),
-    VK_BACK_SLASH    ('*', '@', 'μ', '#', '\u001C'),
+    VK_SEMICOLON     ('m', 'µ', 'M', 'Ó'),
+    VK_QUOTE         ('ù', 'Ù', '%', '‰'),
+    VK_BACK_SLASH    ('*', '@', 'μ', '#'),
 
-    VK_BACK_QUOTE    ('<', '«', '>', '≥', '<'),
-    VK_COMMA         (';', '…', '.', '•', ';'),
-    VK_PERIOD        (':', '÷', '/', '\\', ':'),
-    VK_SLASH         ('!', '¡', '§', '±', '='),
+    VK_BACK_QUOTE    ('<', '«', '>', '≥'),
+    VK_COMMA         (';', '…', '.', '•'),
+    VK_PERIOD        (':', '÷', '/', '\\'),
+    VK_SLASH         ('!', '¡', '§', '±'),
 
     ;
 
@@ -51,12 +51,12 @@ public enum Layout_FRENCH_PC implements LayoutKey {
 
     private final Key key;
 
-    Layout_FRENCH_PC(char no, char alt, char shift, char alt_shift, char control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_FRENCH_PC(char no, char alt, char shift, char alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
-    Layout_FRENCH_PC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_FRENCH_PC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
     public Key getKey() {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Layout_GERMAN.java

@@ -31,20 +31,20 @@ public enum Layout_GERMAN implements LayoutKey {
     // Note that '\u0000' may be used if no char is mapped to a key + modifier or if one wants to skip its testing
 
     //  Eszett
-    VK_MINUS         ('ß', '¿', '?', '˙', 'ß'),
-    VK_EQUALS        (KeyChar.dead('´'), KeyChar.ch('\''), KeyChar.dead('`'), KeyChar.ch('˚'), KeyChar.ch('´')),
+    VK_MINUS         ('ß', '¿', '?', '˙'),
+    VK_EQUALS        (KeyChar.dead('´'), KeyChar.ch('\''), KeyChar.dead('`'), KeyChar.ch('˚')),
 
-    VK_OPEN_BRACKET  ('ü', '•', 'Ü', '°', '\u001D'),
-    VK_CLOSE_BRACKET ('+', '±', '*', '', '+'),
+    VK_OPEN_BRACKET  ('ü', '•', 'Ü', '°'),
+    VK_CLOSE_BRACKET ('+', '±', '*', ''),
 
-    VK_SEMICOLON     ('ö', 'œ', 'Ö',  'Œ', '\u001C'),
-    VK_QUOTE         ('ä', 'æ', 'Ä',  'Æ', '\u001B'),
-    VK_BACK_SLASH    ('#', '‘', '\'', '’', '#'),
+    VK_SEMICOLON     ('ö', 'œ', 'Ö',  'Œ'),
+    VK_QUOTE         ('ä', 'æ', 'Ä',  'Æ'),
+    VK_BACK_SLASH    ('#', '‘', '\'', '’'),
 
-    VK_BACK_QUOTE    ('<', '≤', '>', '≥', '<'),
-    VK_COMMA         (',', '∞', ';', '˛', ','),
-    VK_PERIOD        ('.', '…', ':', '÷', '.'),
-    VK_SLASH         ('-', '–', '_', '—', '-'),
+    VK_BACK_QUOTE    ('<', '≤', '>', '≥'),
+    VK_COMMA         (',', '∞', ';', '˛'),
+    VK_PERIOD        ('.', '…', ':', '÷'),
+    VK_SLASH         ('-', '–', '_', '—'),
 
     ;
 
@@ -52,12 +52,12 @@ public enum Layout_GERMAN implements LayoutKey {
 
     private final Key key;
 
-    Layout_GERMAN(char no, char alt, char shift, char alt_shift, char control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_GERMAN(char no, char alt, char shift, char alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
-    Layout_GERMAN(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_GERMAN(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
     public Key getKey() {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Layout_SPANISH_ISO.java

@@ -30,20 +30,20 @@ public enum Layout_SPANISH_ISO implements LayoutKey {
     // Enum name must be the same as KeyEvent.VK_ constant name corresponding to the key on US keyboard layout
     // Note that '\u0000' may be used if no char is mapped to a key + modifier or if one wants to skip its testing
 
-    VK_MINUS         ('\'', '´', '?', '¸', '\u001F'),
-    VK_EQUALS        ('¡',  '‚', '¿', '˛', '='),
+    VK_MINUS         ('\'', '´', '?', '¸'),
+    VK_EQUALS        ('¡',  '‚', '¿', '˛'),
 
-    VK_OPEN_BRACKET  (KeyChar.dead('`'), KeyChar.ch('['), KeyChar.dead('^'), KeyChar.ch('ˆ'), KeyChar.ch('\u001B')),
-    VK_CLOSE_BRACKET ('+', ']', '*', '±', '\u001D'),
+    VK_OPEN_BRACKET  (KeyChar.dead('`'), KeyChar.ch('['), KeyChar.dead('^'), KeyChar.ch('ˆ')),
+    VK_CLOSE_BRACKET ('+', ']', '*', '±'),
 
-    VK_SEMICOLON     (KeyChar.ch('ñ'),   KeyChar.dead('~'), KeyChar.ch('Ñ'),   KeyChar.ch('˜'), KeyChar.ch(':')),
-    VK_QUOTE         (KeyChar.dead('´'), KeyChar.ch('{'),   KeyChar.dead('¨'), KeyChar.ch('«'), KeyChar.ch('"')),
-    VK_BACK_SLASH    ('ç', '}', 'Ç', '»', '\u001C'),
+    VK_SEMICOLON     (KeyChar.ch('ñ'),   KeyChar.dead('~'), KeyChar.ch('Ñ'),   KeyChar.ch('˜')),
+    VK_QUOTE         (KeyChar.dead('´'), KeyChar.ch('{'),   KeyChar.dead('¨'), KeyChar.ch('«')),
+    VK_BACK_SLASH    ('ç', '}', 'Ç', '»'),
 
-    VK_BACK_QUOTE    ('<', '≤', '>', '≥', '`'),
-    VK_COMMA         (',', '„', ';', '\u0000', ','),
-    VK_PERIOD        ('.', '…', ':', '…', '.'),
-    VK_SLASH         ('-', '–', '_', '—', '/'),
+    VK_BACK_QUOTE    ('<', '≤', '>', '≥'),
+    VK_COMMA         (',', '„', ';', '\u0000'),
+    VK_PERIOD        ('.', '…', ':', '…'),
+    VK_SLASH         ('-', '–', '_', '—'),
 
     ;
 
@@ -51,12 +51,12 @@ public enum Layout_SPANISH_ISO implements LayoutKey {
 
     private final Key key;
 
-    Layout_SPANISH_ISO(char no, char alt, char shift, char alt_shift, char control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_SPANISH_ISO(char no, char alt, char shift, char alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
-    Layout_SPANISH_ISO(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_SPANISH_ISO(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
     public Key getKey() {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Layout_US_INTERNATIONAL_PC.java

@@ -30,21 +30,21 @@ public enum Layout_US_INTERNATIONAL_PC implements LayoutKey {
     // Enum name must be the same as KeyEvent.VK_ constant name corresponding to the key on US keyboard layout
     // Note that '\u0000' may be used if no char is mapped to a key + modifier or if one wants to skip its testing
 
-    VK_MINUS         ('-', '–', '_', '—', '\u001F'),
-    VK_EQUALS        ('=', '≠', '+', '±', '='),
+    VK_MINUS         ('-', '–', '_', '—'),
+    VK_EQUALS        ('=', '≠', '+', '±'),
 
-    VK_OPEN_BRACKET  ('[', '“', '{', '”', '\u001B'),
-    VK_CLOSE_BRACKET (']', '‘', '}', '’', '\u001D'),
+    VK_OPEN_BRACKET  ('[', '“', '{', '”'),
+    VK_CLOSE_BRACKET (']', '‘', '}', '’'),
 
-    VK_SEMICOLON     (';',  '…', ':', 'Ú', ';'),
+    VK_SEMICOLON     (';',  '…', ':', 'Ú'),
     // ' is a special dead symbol, which may add either acute or cedilla to the next key
-    VK_QUOTE         (KeyChar.dead('\''), KeyChar.ch('æ'), KeyChar.dead('\"'), KeyChar.ch('Æ'), KeyChar.ch('\'')),
-    VK_BACK_SLASH    ('\\', '«', '|', '»', '\u001C'),
+    VK_QUOTE         (KeyChar.dead('\''), KeyChar.ch('æ'), KeyChar.dead('\"'), KeyChar.ch('Æ')),
+    VK_BACK_SLASH    ('\\', '«', '|', '»'),
 
-    VK_BACK_QUOTE    (KeyChar.dead('`'), KeyChar.dead('`'), KeyChar.dead('~'), KeyChar.ch('`'), KeyChar.ch('`')),
-    VK_COMMA         (',', '≤', '<', '¯', ','),
-    VK_PERIOD        ('.', '≥', '>', '˘', '.'),
-    VK_SLASH         ('/', '÷', '?', '¿', '/'),
+    VK_BACK_QUOTE    (KeyChar.dead('`'), KeyChar.dead('`'), KeyChar.dead('~'), KeyChar.ch('`')),
+    VK_COMMA         (',', '≤', '<', '¯'),
+    VK_PERIOD        ('.', '≥', '>', '˘'),
+    VK_SLASH         ('/', '÷', '?', '¿'),
 
     ;
 
@@ -52,12 +52,12 @@ public enum Layout_US_INTERNATIONAL_PC implements LayoutKey {
 
     private final Key key;
 
-    Layout_US_INTERNATIONAL_PC(char no, char alt, char shift, char alt_shift, char control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_US_INTERNATIONAL_PC(char no, char alt, char shift, char alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
-    Layout_US_INTERNATIONAL_PC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
-        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift, control));
+    Layout_US_INTERNATIONAL_PC(KeyChar no, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
+        key = new Key(name(), new MappedKeyChars(no, alt, shift, alt_shift));
     }
 
     public Key getKey() {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/MappedKeyChars.java

@@ -23,22 +23,20 @@ public class MappedKeyChars {
     private final KeyChar alt;
     private final KeyChar shift;
     private final KeyChar alt_shift;
-    private final KeyChar control;
 
-    MappedKeyChars(char no_modifier, char alt, char shift, char alt_shift, char control) {
+    MappedKeyChars(char no_modifier, char alt, char shift, char alt_shift) {
         this.no_modifier = KeyChar.ch(no_modifier);
         this.alt = KeyChar.ch(alt);
         this.shift = KeyChar.ch(shift);
         this.alt_shift = KeyChar.ch(alt_shift);
-        this.control = KeyChar.ch(control);
     }
 
-    MappedKeyChars(KeyChar  no_modifier, KeyChar alt, KeyChar shift, KeyChar alt_shift, KeyChar control) {
+    MappedKeyChars(KeyChar  no_modifier, KeyChar alt, KeyChar shift, KeyChar alt_shift) {
         this.no_modifier = no_modifier;
         this.alt = alt;
         this.shift = shift;
         this.alt_shift = alt_shift;
-        this.control = control;
+
     }
 
     /*
@@ -59,9 +57,6 @@ public class MappedKeyChars {
         if(modifier.isAltShift()) {
             return alt_shift;
         }
-        if(modifier.isControl()) {
-            return control;
-        }
         return KeyChar.ch(Character.MAX_VALUE);
     }
 

test/jdk/jb/sun/awt/macos/NationalLayoutTest/Modifier.java

@@ -94,10 +94,6 @@ public enum Modifier {
         return ((modifiers.length == 2) && list.contains(KeyEvent.VK_ALT) && list.contains(KeyEvent.VK_SHIFT));
     }
 
-    boolean isControl() {
-        return ((modifiers.length == 1) && (modifiers[0] == KeyEvent.VK_CONTROL));
-    }
-
     @Override
     public String toString() {
         if (modifiers.length == 0) {

test/jdk/jb/sun/awt/macos/NationalLayoutTest/NationalLayoutTest.java

@@ -57,9 +57,7 @@ import java.util.stream.Collectors;
  * - No keyTyped event is expected as the result of pressing dead key + key.
  * - Pressing "dead key + space" generates corresponding diacritic character,
  *   which may be obtained using inputMethodTextChanged event.
- * - Ctrl can be used to type the "control characters" (0th to 31th character inclusively in the ASCII table),
- *   so Ctrl + key can generate keyTyped event.
- * - Cmd and its combinations with other modifiers are considered as a "shortcut",
+ * - Cmd, Ctrl and its combinations with other modifiers are considered as a "shortcut",
  *   no keyTyped event is expected as the result of pressing a shortcut,
  *   no attempts are made to check inputMethodTextChanged event result for a "shortcut".
  *
@@ -184,7 +182,7 @@ public class NationalLayoutTest {
                 for (Modifier modifier : Modifier.values()) {
                     if(!testLayout(layout, modifier)) {
                         failed = true;
-                    }
+                    };
                 }
             }
             // Provide the test result
@@ -255,7 +253,7 @@ public class NationalLayoutTest {
         // Corresponding latch is released in the typeAreaFocusListener.
         if(!typeAreaGainedFocus.await(PAUSE, TimeUnit.MILLISECONDS)) {
             throw new RuntimeException("TEST ERROR: Failed to request focus in the text area for typing");
-        }
+        };
     }
 
     /*
@@ -307,21 +305,9 @@ public class NationalLayoutTest {
             // Obtain typed char
             char keyChar = e.getKeyChar();
             int keyCode = KeyEvent.getExtendedKeyCodeForChar(keyChar);
-
-            switch (keyCode) {
-                case NEXT_MODIFIER:
-                case NEXT_KEY:
-                case TERMINATE_KEY:
-                    if ((e.getModifiers() & KeyEvent.CTRL_MASK) == 0) {
-                        // Do not store the typed char only if it is NEXT_MODIFIER, NEXT_KEY, TERMINATE_KEY generated
-                        //  without Control modifier: the Control allows to "type" the "control characters"
-                        //  (0th to 31th character inclusively in the ASCII table).
-                        break;
-                    }
-                default:
-                    // Store typed char to the corresponding list
-                    charsTyped.add(keyChar);
-                    break;
+            if ((keyCode != NEXT_MODIFIER) && (keyCode != NEXT_KEY) && (keyCode != TERMINATE_KEY)) {
+                // Store typed char to the corresponding list
+                charsTyped.add(keyChar);
             }
         }
     };
@@ -370,7 +356,7 @@ public class NationalLayoutTest {
         }
         if(!nextModifierSet.await(PAUSE*10, TimeUnit.MILLISECONDS)) {
             throw new RuntimeException("TEST ERROR: User has not proceeded with manual testing");
-        }
+        };
 
         // Clean up the test text areas
         inputArea.setText("");
@@ -425,7 +411,7 @@ public class NationalLayoutTest {
             if(!nextKey.await(PAUSE, TimeUnit.MILLISECONDS)) {
                 throw new RuntimeException("TEST ERROR: "
                         + KeyEvent.getKeyText(NEXT_KEY) + " key pressed event was not received");
-            }
+            };
 
             // Define array of key codes expected to be pressed as the result of modifiers + key
             int[] keysPattern = Arrays.copyOf(modifiers, modifiers.length + 1);
@@ -440,7 +426,7 @@ public class NationalLayoutTest {
                 // Check if the pressed key codes are equal to the expected ones
                 if(!checkResult(keysPattern, keysResult, null,null)) {
                     result = false;
-                }
+                };
             } else {
                 // Define array of chars expected to be typed as the result of modifiers + key
                 // Do not expect any char typed as the result of shortcut (char is undefined in this case)
@@ -454,7 +440,7 @@ public class NationalLayoutTest {
                 // Check if pressed key codes and typed chars are equal to the expected ones
                 if(!checkResult(keysPattern, keysResult, charsPattern, charsResult)) {
                     result = false;
-                }
+                };
             }
         }
         // Provide layout + modifier testing result
@@ -487,7 +473,7 @@ public class NationalLayoutTest {
         boolean checkKeys = Arrays.equals(patternKeys, resultKeys);
         boolean checkChars = Arrays.equals(patternChars, resultChars);
 
-        boolean result = (checkKeys && checkChars);
+        boolean result = (checkKeys & checkChars);
 
         if(!result) {
             String[] patternStr = (patternKeys != null) ? intsToStrings(patternKeys) : null;

test/jdk/jb/tools/launcher/modules/illegalaccess/JbrIllegalAccessTest.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8266851
- * @library /test/lib
- * @build JbrIllegalAccessTest
- * @run testng JbrIllegalAccessTest
- * @summary Make sure that --jbr-illegal-access is working.
- */
-
-import jdk.test.lib.process.*;
-import org.testng.annotations.*;
-
-/**
- * Make sure that --jbr-illegal-access is working as expected.
- */
-
-@Test
-public class JbrIllegalAccessTest {
-
-    void run(String text, String... vmopts)
-        throws Exception
-    {
-        var outputAnalyzer = ProcessTools
-            .executeTestJava(vmopts)
-            .outputTo(System.out)
-            .errorTo(System.out);
-        outputAnalyzer.shouldContain(text);
-    }
-
-    public void testObsolete() throws Exception {
-        run("Option --jbr-illegal-access is deprecated",
-            "-XX:-IgnoreUnrecognizedVMOptions",
-            "--jbr-illegal-access", "--version");
-    }
-
-}

test/jdk/jbProblemList.txt

@@ -733,7 +733,6 @@ javax/sound/midi/Sequencer/MetaCallback.java 8178698 linux-all
 # jdk_swing
 
 javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java 8194945 macosx-all
-javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 8253184 windows-all
 javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java 8233177 linux-all,windows-all
 
 javax/swing/border/TestTitledBorderLeak.java 8213531 linux-all,windows-all
@@ -936,7 +935,4 @@ com/sun/java/swing/plaf/windows/Test8173145.java
 com/sun/java/swing/plaf/windows/AltFocusIssueTest.java                              JBR-4197 windows-all
 
 java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java            JBR-4207 windows-all
-jb/java/awt/keyboard/AltGrMustGenerateAltGrModifierTest4207.java                    JBR-4207 windows-all
-
-java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java JBR-4250 windows-all
-java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                 JBR-4250 windows-all
+jb/java/awt/keyboard/AltGrMustGenerateAltGrModifierTest4207.java                    JBR-4207 windows-all

test/jdk/jbScale2ProblemList.txt

@@ -1,4 +1,3 @@
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java               JBR-890  generic-all
 java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java                   JBR-1011 generic-all
-java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8279190 linux-all,windows-all,macosx-all
-java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java                  8282232 windows-all
+java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8279190 linux-all,windows-all,macosx-all

test/jdk/jbcommitProblemList.txt

@@ -1 +0,0 @@
-javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh nobug generic-all line 59: /opt/teamcity-agent/work/efb45cc305c2e813/jbr/Contents/Home/bin/jar: No such file or directory